Skip to content

Make bower_install respect overrides to main specified in bower.json #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 6, 2015
Merged

Make bower_install respect overrides to main specified in bower.json #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions djangobwr/management/commands/bower_install.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ class Command(BaseCommand):
'distribution files to settings.COMPONENT_ROOT'),
)
bower_info = {}
overrides = {}

def npm_install(self, pkg_json_path):
os.chdir(os.path.dirname(pkg_json_path))
Expand Down Expand Up @@ -87,12 +88,18 @@ def get_bower_info(self, bower_json_path):
if not bower_json_path in self.bower_info:
self.bower_info[bower_json_path] = json.load(open(bower_json_path))

def get_bower_main_list(self, bower_json_path):
"""Returns the bower.json main list or empty list.
def get_bower_main_list(self, bower_json_path, override):
"""
Returns the bower.json main list or empty list.
Applies overrides from the site-wide bower.json.
"""
self.get_bower_info(bower_json_path)

main_list = self.bower_info[bower_json_path].get('main')
component = self.bower_info[bower_json_path].get('name')

if self.bower_info[override].get("overrides").get(component):
main_list = self.bower_info[override].get("overrides").get(component).get("main")

if isinstance(main_list, list):
return main_list
Expand All @@ -109,7 +116,7 @@ def get_bower_version(self, bower_json_path):

return self.bower_info[bower_json_path].get("version")

def clean_components_to_static_dir(self, bower_dir):
def clean_components_to_static_dir(self, bower_dir, override):
print("\nMoving component files to %s\n" % (self.component_root,))

for directory in os.listdir(bower_dir):
Expand All @@ -120,7 +127,7 @@ def clean_components_to_static_dir(self, bower_dir):
for bower_json in ['bower.json', '.bower.json']:
bower_json_path = os.path.join(src_root, bower_json)
if os.path.exists(bower_json_path):
main_list = self.get_bower_main_list(bower_json_path)
main_list = self.get_bower_main_list(bower_json_path, override)
version = self.get_bower_version(bower_json_path)

dst_root = os.path.join(self.component_root, directory)
Expand Down Expand Up @@ -167,7 +174,6 @@ def clean_components_to_static_dir(self, bower_dir):
os.makedirs(dst_dir)

print(' {0} > {1}'.format(src_path, dst_path))

shutil.copy(src_path, dst_path)
break

Expand Down Expand Up @@ -211,6 +217,7 @@ def handle(self, *args, **options):

for finder in finders:
for path in finder.find('bower.json', all=True):
self.get_bower_info(path)
self.bower_install(path, temp_dir)

bower_dir = os.path.join(temp_dir, 'bower_components')
Expand All @@ -220,7 +227,7 @@ def handle(self, *args, **options):
print('No components seems to have been found by bower, exiting.')
sys.exit(0)

self.clean_components_to_static_dir(bower_dir)
self.clean_components_to_static_dir(bower_dir, path)

if not self.keep_packages:
shutil.rmtree(temp_dir)
Expand Down