bower_vendor 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b417d3edd915d7fde1d0881d3beda3307c347e6782e42a5d440dd0479578304
-  data.tar.gz: 4dd3926b2c96f3ba301f34b0b3cf3d223f30b2a4c181ad10a62f29a5b7bbcc1d
+  metadata.gz: ae8df14c3a4d96a011ea97afacbb840302295cf7ccad308ba7c85c2e54bbc102
+  data.tar.gz: 7023fd813d12928fc16e54b1a5be7e05cb6475f07af0ce5c1a46c48b9275950d
 SHA512:
-  metadata.gz: 57d05d4bd63b24fc08baac65304a22902b10cb0d810c842c7eabc942e53d9877efe8e1ec26b632449cf72510702cca4cc1440586f49de00cc660791ac2282fe5
-  data.tar.gz: 669245594777c50b5c18cc1721a488ea6e4b1848af9a05691b5718b55ce5e1f9c0bd9d57682b342325f11d273b036cea61a8fea6097523b7fd41b46f9b47f399
+  metadata.gz: 2b57c087bf946edd1e96a8213ac99a9973da50afe983ef1ce4f8b5778ee687a22f1a47ba6d519953bdd787312516389bf56ed345be1f308da7e06a0e1c41bccb
+  data.tar.gz: 3ad422ffec81f6bff8c73d15cbdbfa0f98f9cf0969402d30b5a4e907c45dac9b9eacbbac111be31afb21646f8ed3f1347442b429e7d5ff8a4dfceb24c5fca546

data/lib/bower_vendor/base.rb

@@ -3,14 +3,18 @@ class BowerVendor::Base
   end
 
   def vendors
-    @vendors ||= load_vendors
-    validate_vendors
+    @vendors ||= load_vendors.delete_if { |vendor, vendor_data| !accept_vendor?(vendor, vendor_data) }
+    validate_vendors(@vendors)
     @vendors
   end
 
-  def validate_vendors
+  def accept_vendor?(vendor, vendor_data)
+    !vendor_data['yarn']
+  end
+
+  def validate_vendors(vendors)
     # validate resources
-    @vendors.each do |vendor_key, vendor|
+    vendors.each do |vendor_key, vendor|
       raise "VERSION MISSING: #{vendor_key}: #{vendor.inspect}" unless vendor['version']
       puts "WARN: ASSETS MISSING: #{vendor_key}: #{vendor.inspect}" unless vendor['assets']
     end
@@ -29,8 +33,8 @@ class BowerVendor::Base
     end
   end
 
-  def full_asset_key_src_dir(asset_key)
-    "#{self.work_dir}/bower_components/#{asset_key}"
+  def full_vendor_src_dir(vendor)
+    "#{self.work_dir}/bower_components/#{vendor}"
   end
 
   def work_dir

data/lib/bower_vendor/copy.rb

@@ -1,19 +1,19 @@
 class BowerVendor::Copy < BowerVendor::Base
   def execute
-    vendors.each do |asset_key, asset_data|
-      src_dir = full_asset_key_src_dir(asset_key)
+    vendors.each do |vendor, asset_data|
+      src_dir = full_vendor_src_dir(vendor)
       msg 0, "processing: #{src_dir}"
 
-      run_build_scripts(asset_key, asset_data, 1)
-      copy_assets(asset_key, asset_data, 1)
+      run_build_scripts(vendor, asset_data, 1)
+      copy_assets(vendor, asset_data, 1)
     end
   end
 
-  def run_build_scripts(asset_key, asset_data, level)
+  def run_build_scripts(vendor, asset_data, level)
     scripts = (asset_data['build'] || [])
     return if scripts.empty?
 
-    src_dir = full_asset_key_src_dir(asset_key)
+    src_dir = full_vendor_src_dir(vendor)
 
     msg level, "building..."
     scripts.each do |cmd|
@@ -27,12 +27,12 @@ class BowerVendor::Copy < BowerVendor::Base
     end
   end
 
-  def copy_assets(asset_key, asset_data, level)
-    msg level, "copying: #{asset_key}..."
-    copy_asset(asset_key, asset_data, asset_data['assets'], '', level + 1)
+  def copy_assets(vendor, asset_data, level)
+    msg level, "copying: #{vendor}..."
+    copy_asset(vendor, asset_data, asset_data['assets'], '', level + 1)
   end
 
-  def copy_asset(asset_key, asset_data, assets, target_path = '', level)
+  def copy_asset(vendor, asset_data, assets, target_path = '', level)
     assets ||= []
     if assets.empty?
       msg level, "WARN: ASSETS MISSING"
@@ -42,7 +42,7 @@ class BowerVendor::Copy < BowerVendor::Base
       if asset.is_a? Hash
         sub_asset = asset.keys.first
         sub_target_path = target_path.empty? ? sub_asset : target_path + '/' + sub_asset
-        copy_asset(asset_key, asset_data, asset[sub_asset], sub_target_path, level + 1)
+        copy_asset(vendor, asset_data, asset[sub_asset], sub_target_path, level + 1)
       else
         msg level, asset
 
@@ -50,18 +50,18 @@ class BowerVendor::Copy < BowerVendor::Base
         raise "VERSION MISSING: #{asset_data.inspect}" if version.empty?
 
         asset_path = asset.gsub("{{VERSION}}", version)
-        src = "#{full_asset_key_src_dir(asset_key)}/#{asset_path}"
+        src = "#{full_vendor_src_dir(vendor)}/#{asset_path}"
 
         files = Dir[src].sort!
         raise "NOT_FOUND: #{src}" if files.empty?
         files.each do |src_path|
-          copy_src_file asset_key, asset_data, asset, src_path, target_path, level + 1
+          copy_src_file vendor, asset_data, asset, src_path, target_path, level + 1
         end
       end
     end
   end
 
-  def copy_src_file(asset_key, asset_data, orig_path, full_src_file, target_path, level)
+  def copy_src_file(vendor, asset_data, orig_path, full_src_file, target_path, level)
     if !File.exist? full_src_file
       raise "NOT_FOUND: #{full_src_file}"
     end
@@ -74,7 +74,7 @@ class BowerVendor::Copy < BowerVendor::Base
     base_dst_dir = self.dst_dirs[ext]
     raise "NOT_FOUND_EXT: #{ext}" unless base_dst_dir
 
-    dst_dir = "#{base_dst_dir}/#{asset_key}-#{version}"
+    dst_dir = "#{base_dst_dir}/#{vendor}-#{version}"
     dst_dir = "#{dst_dir}/#{target_path}" unless target_path.empty?
     full_dst_file = "#{dst_dir}/#{dst_file}"
 

data/lib/bower_vendor/version.rb

@@ -1,3 +1,3 @@
 module BowerVendor
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/bower_vendor/yarn.rb

@@ -1,24 +1,25 @@
 class BowerVendor::Yarn < BowerVendor::Copy
-  def full_asset_key_src_dir(asset_key)
-    "node_modules/#{asset_key}"
+  def full_vendor_src_dir(vendor)
+    "node_modules/#{vendor}"
   end
 
-  def validate_vendors
-    # nothing
+  def accept_vendor?(vendor, vendor_data)
+    vendor_data['yarn']
   end
 
   def load_vendors
     versions = load_vendor_versions
 
-    vendors = YAML.load_file 'vendor_yarn.yml'
+    vendors_data = YAML.load_file 'vendor.yml'
+    vendors_data.delete_if { |vendor, vendor_data| !accept_vendor?(vendor, vendor_data) }
 
-    vendors.each do |vendor, vendor_data|
+    vendors_data.each do |vendor, vendor_data|
       version = versions[vendor]
       raise "YARN: missing vendor: #{vendor}" unless version
       vendor_data['version'] = version
     end
 
-    vendors
+    vendors_data
   end
 
   def load_vendor_versions

data/vendor.yml

@@ -21,3 +21,33 @@ test_3:
   version: test3
   assets:
   - index.jpg
+
+bootstrap:
+  yarn: true
+  assets:
+    - scss/*.scss
+    - mixins:
+        - scss/mixins/*.scss
+    - utilities:
+        - scss/utilities/*.scss
+    - js/dist/*.js
+
+jquery:
+  yarn: true
+  assets:
+    - dist/jquery.js
+
+lodash:
+  yarn: true
+  assets:
+    - lodash.js
+
+url.js:
+  yarn: true
+  assets:
+    - url.js
+
+vue:
+  yarn: true
+  assets:
+    - dist/vue.js

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bower_vendor
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - kari
@@ -99,7 +99,6 @@ files:
 - test/test1.js
 - test/test2.js
 - vendor.yml
-- vendor_yarn.yml
 - yarn.lock
 homepage: https://github.com/kikonen/bower_vendor
 licenses:

data/vendor_yarn.yml

@@ -1,24 +0,0 @@
-bootstrap:
-  assets:
-    - scss/*.scss
-    - mixins:
-        - scss/mixins/*.scss
-    - utilities:
-        - scss/utilities/*.scss
-    - js/dist/*.js
-
-jquery:
-  assets:
-    - dist/jquery.js
-
-lodash:
-  assets:
-    - lodash.js
-
-url.js:
-  assets:
-    - url.js
-
-vue:
-  assets:
-    - dist/vue.js