bower-rails 0.9.2 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bac09d7777aefd06a5be16848df529d7f0ab4ada
-  data.tar.gz: 6b77c226ceffd97162d54ba8fec64fe0303507b3
+  metadata.gz: 05faebea58423491bfd583dab2eca0b0ba062724
+  data.tar.gz: e63b4071d055ccd6b8c68898311c3fa794a02871
 SHA512:
-  metadata.gz: 8e23cf065c09988eaf220f21298b9ca8a54f5c0b8d7aabb0be498680d024b7bf6fd64747f3faaffead35d7e66b064885b37b25e40bdb44bf1ccdc50f65800113
-  data.tar.gz: 040922cf262805e6283b93c7ece6fed77ea42745e289d2b9ead335c1e09dba2c286a7f44474e41e2b6c08a8ac0fea204e681ee2e001bfc0bf2b282d747c80fa3
+  metadata.gz: 8683a3796762962d9d43030c2af460440b7cc25c45f6ef9b1f380797ba295878975346d6d076e6900d3a44737d2312e92f512e0ed774333057f25585100a0239
+  data.tar.gz: dece1f7c79ce74a344d30a56d1dd2b1e6e17336e20b07a0b69c6543f4da1e9a57051f39de3b04a2694f79b89cb0cc1040ba72cedbf6805e10ce23f631ebb5f8f

data/README.md

@@ -4,11 +4,11 @@ bower-rails
 [![Gem Version](http://img.shields.io/gem/v/bower-rails.svg)][gem]
 [![Code Climate](http://img.shields.io/codeclimate/github/42dev/bower-rails.svg)][codeclimate]
 [![Dependency Status](http://img.shields.io/gemnasium/SergeyKishenin/bower-rails.svg)][gemnasium]
-[![Build Status](https://travis-ci.org/42dev/bower-rails.svg?branch=master)][travis]
+[![Build Status](https://travis-ci.org/rharriso/bower-rails.svg?branch=master)][travis]
 [![Coverage Status](https://coveralls.io/repos/42dev/bower-rails/badge.png)][coveralls]
 
 [gem]: https://rubygems.org/gems/bower-rails
-[travis]: https://travis-ci.org/42dev/bower-rails
+[travis]: https://travis-ci.org/rharriso/bower-rails
 [gemnasium]: https://gemnasium.com/SergeyKishenin/bower-rails
 [codeclimate]: https://codeclimate.com/github/42dev/bower-rails
 [coveralls]: https://coveralls.io/r/42dev/bower-rails
@@ -23,12 +23,14 @@ Check out [changelog][] for the latest changes and releases.
 * [node](http://nodejs.org) ([on github](https://github.com/joyent/node))
 * [bower](https://github.com/bower/bower) (>= 0.10.0) installed with npm
 
+NOTE: If you install `node` via package manager with `sudo apt-get install nodejs` you'll also need to install `nodejs-legacy` with `sudo apt-get install nodejs-legacy`. See [#91](https://github.com/42dev/bower-rails/issues/91)
+
 **Install**
 
 in Gemfile
 
 ``` Ruby
-  gem "bower-rails", "~> 0.9.1"
+  gem "bower-rails", "~> 0.10.0"
 ```
 
 ##JSON configuration
@@ -92,6 +94,9 @@ asset "secret_logic", "1.0.0", github: "initech/secret_logic"
 
 # get a specific revision from a git endpoint
 asset "secret_logic", github: "initech/secret_logic", ref: '0adff'
+
+# get a single file
+asset "three.js", "https://raw.github.com/mrdoob/three.js/master/build/three.js"
 ```
 
 But the default value can be overridden by `assets_path` method:
@@ -124,6 +129,23 @@ end
 NOTE: Available groups are `:lib` and `:vendor`. Others are not allowed according to the Rails convention.
 NOTE: All the assets should be stored in `/assets` subdirectory so putting it under `./vendor/js` directory is unavailable
 
+You can extend `main` directive to include some missing files using `main_files` 
+option as parameter or in a block:
+
+``` ruby
+# via argument
+asset "moment", "2.10.1", main_files: ["./locale/en-gb.js"]
+
+# or in block
+asset "moment", "2.10.1" do
+  main_files [
+    "./locale/en-gb.js",
+    "./locale/fr.js",
+    "./locale/lv.js"
+  ]
+end
+```
+
 And finally, you can specify the assets to be in the devDependencies block:
 
 ``` ruby
@@ -201,6 +223,9 @@ BowerRails.configure do |bower_rails|
 
   # Invokes rake bower:install:deployment instead rake bower:install. Defaults to false
   bower_rails.use_bower_install_deployment = true
+
+  # Passes the -F option to rake bower:install or rake bower:install:deployment. Defaults to false.
+  bower_rails.force_install = true
 end
 ```
 
@@ -236,6 +261,24 @@ If you'd like to pass any bower CLI options to a rake task, like `-f`, `-j`, you
 rake bower:install['-f']
 ```
 
+##Capistrano 3 Configuration
+
+While using Capistrano 3 and Capistrano Rails gem, it's needed to run bower install before assets compile. Add the following code to your deploy.rb, it will run `rake bower:install` before compiling the assets. CI=true flag is used not to ask for the analytics at the first bower install.
+
+```
+namespace :bower do
+  desc 'Install bower'
+  task :install do
+    on roles(:web) do
+      within release_path do
+        execute :rake, 'bower:install CI=true'
+      end
+    end
+  end
+end
+before 'deploy:compile_assets', 'bower:install'
+```
+
 ##Bower Configuration
 
 If you provide a `.bowerrc` in the rails project root, bower-rails will use it for bower configuration.
@@ -254,4 +297,11 @@ Remember that you should have [bower installed](#bower-installation) either loca
 
 ##Bower Main Files
 
-Each bower component should follow the [bower.json spec](https://github.com/bower/bower.json-spec) which designates a recommended `main` directive that lists the primary files of that component. You may choose to reference these files if you are using the asset pipeline, in which case other extraneous includes of the bower component are not needed. The `rake bower:clean` task removes every file that isn't listed in the `main` directive, if the component specifies a `main` directive. Otherwise, the library will remain as bower installed it. It supports wildcards in files listed in `main` directive.
+Each bower component should follow the [bower.json spec](https://github.com/bower/bower.json-spec) 
+which designates a recommended `main` directive that lists the primary files of 
+that component. You may choose to reference these files if you are using the asset 
+pipeline, in which case other extraneous includes of the bower component are not needed. 
+The `rake bower:clean` task removes every file that isn't listed in the `main` directive, 
+if the component specifies a `main` directive. Remember that you can extend the `main` directive
+in [ruby DSL configuration](#ruby-dsl-configuration). Otherwise, the library will remain as bower installed it. It supports wildcards 
+in files listed in `main` directive.

data/lib/bower-rails.rb

@@ -26,6 +26,10 @@ module BowerRails
     # instead of rake bower:install before assets precompilation
     attr_accessor :use_bower_install_deployment
 
+    # If set to true then rake bower:install[-f] will be invoked
+    # instead of rake bower:install before assets precompilation
+    attr_accessor :force_install
+
     def configure &block
       yield self if block_given?
       collect_tasks
@@ -36,6 +40,7 @@ module BowerRails
       def collect_tasks
         install_cmd = 'bower:install'
         install_cmd = 'bower:install:deployment' if @use_bower_install_deployment
+        install_cmd += '[-F]' if @force_install
 
         @tasks << [install_cmd] if @install_before_precompile
         @tasks << [install_cmd, 'bower:clean']   if @clean_before_precompile
@@ -53,4 +58,5 @@ module BowerRails
   @resolve_before_precompile    = false
   @clean_before_precompile      = false
   @use_bower_install_deployment = false
+  @force_install = false
 end

data/lib/bower-rails/dsl.rb

@@ -19,9 +19,11 @@ module BowerRails
       @dependencies = {}
       @resolutions = {}
       @assets_path ||= "assets"
+      @main_files = {}
     end
 
-    def asset(name, *args)
+    def asset(name, *args, &block)
+      @asset_name = name
       group = @current_group || default_group
       options = Hash === args.last ? args.pop.dup : {}
 
@@ -38,6 +40,12 @@ module BowerRails
                   end
       end
 
+      if options[:main_files]
+        main_files(options[:main_files])
+      end
+
+      instance_eval(&block) if block_given?
+
       normalized_group_path = normalize_location_path(group.first, group_assets_path(group))
       @dependencies[normalized_group_path] ||= {}
       @dependencies[normalized_group_path][current_dependency_group_normalized] ||= {}
@@ -116,6 +124,14 @@ module BowerRails
       end
     end
 
+    # accepts string or array to alter main option for bower.json
+    def main_files(value = nil)
+      if value
+        @main_files[@asset_name] = Array(value)
+      end
+      @main_files
+    end
+
     private
 
     # Stores the dependency group name in the stack

data/lib/bower-rails/performer.rb

@@ -157,11 +157,9 @@ module BowerRails
 
         # Parse bower.json
         bower_json = JSON.parse(bower_file)
-        main_files = bower_json['main']
-        next unless main_files
-
-        # Handle singular or multiple files
-        main_files = [main_files] unless main_files.is_a?(Array)
+        component_name = component_dir.split('/').last
+        main_files = Array(bower_json['main']) + main_files_for_component(component_name)
+        next if main_files.empty?
 
         # Remove "./" relative path from main file strings
         main_files.map! { |file| File.join(component_dir, file.gsub(/^\.\//, '')) }
@@ -194,5 +192,10 @@ module BowerRails
       nil
     end
 
+    private
+
+    def main_files_for_component(name)
+      Array(dsl.main_files[name])
+    end
   end
-end
+end

data/lib/bower-rails/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module BowerRails
-  VERSION = "0.9.2"
+  VERSION = "0.10.0"
 end

data/lib/generators/bower_rails/initialize/templates/bower_rails.rb

@@ -10,7 +10,10 @@ BowerRails.configure do |bower_rails|
 
   # Invokes rake bower:clean before precompilation. Defaults to false
   # bower_rails.clean_before_precompile = true
-  
+
   # Invokes rake bower:install:deployment instead rake bower:install. Defaults to false
   # bower_rails.use_bower_install_deployment = true
+  #
+  # Invokes rake bower:install and rake bower:install:deployment with -F (force) flag. Defaults to false
+  # bower_rails.force_install = true
 end

data/lib/tasks/bower.rake

@@ -86,7 +86,7 @@ namespace :bower do
 
   task :before_precompile do
     BowerRails.tasks.each do |task|
-      Rake::Task[task].invoke
+      Rake.application.invoke_task(task)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bower-rails
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.10.0
 platform: ruby
 authors:
 - Ross Harrison
@@ -90,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: Bower for Rails