bower-rails 0.4.4 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11f1465332da4588fdbf82ba6ac1baf8ac6af36d
-  data.tar.gz: 58b9f18ebe219e4e94ccad4e1b00a4201d38d1cf
+  metadata.gz: 16fcf55d5a780de4c4ae812c3f56174cdc3db86b
+  data.tar.gz: 874ce01615f934ea561b4c6eb5c8209b2c59205b
 SHA512:
-  metadata.gz: 9faedd78286fb6e4197f2e8551ef9eebc74f862ede75f6a53742307ba4600c77e1d560f5567d5c46e16d7b23ef6ae2d76f28920b129e9c8c74c34cab3b8f89dd
-  data.tar.gz: 480e4ad3a2cdee80ee0b6b4fac2515ddebb20f17cf9d053f1d1e926a3f4d5c307a0eeb3c4e1c2e90fe441a8e3b867b1b3ad86e89e2d92bcd67403ed3c96fc08d
+  metadata.gz: 852c5924db1d15a70a3bf45cd90cab5a700180efa52c6257acc8e36ae924e58e29d8b9bc7a7ebb256f872b129ffc3f325934b85b1f1cd002ae96188335cde921
+  data.tar.gz: db064ec965fbe7fa76069997576a763ed3d91a16754efe02c4533201a1b6f61bce21533dc24eb59568f9073de0b69341bcbad3b1b922c642252fd29ccea21415

data/README.md

@@ -1,7 +1,8 @@
 bower-rails
 ===========
 
-rake tasks for bower on rails. Dependency file is bower.json in Rails root dir.
+Bower support for Rails projects. Dependency file is bower.json in Rails root dir or Bowerfile if you use DSL.
+Check out Changelog.md for the latest changes and releases.
 
 **Requirements**
 
@@ -48,30 +49,19 @@ The bower.json file is two seperate bower [component.js](https://github.com/twit
 }
 ```
 
-
-**Available commands**
-
-``` bash
-  rake bower:install #install js components
-  rake bower:install:force #install with force option
-  rake bower:update #update js components
-  rake bower:update:prune #update components and uninstall extraneous packages
-```
-
-
 ##Ruby DSL configuration
 
-The Ruby DSL configuration is a Jsfile with DSL syntax similar to Bundler. 
+The Ruby DSL configuration is a Bowerfile at the project's root with DSL syntax similar to Bundler. 
 
-**Example Jsfile**
+**Example Bowerfile**
 
 By default assets are put to `./vendor/assets/bower_components` directory:
 
 ``` ruby
 
 # Puts to ./vendor/assets/bower_components
-js "backbone"
-js "moment"
+asset "backbone"
+asset "moment"
 ```
 
 But the default value can be overridden by `assets_path` method:
@@ -80,8 +70,8 @@ But the default value can be overridden by `assets_path` method:
 assets_path "assets/my_javascripts"
 
 # Puts to ./vendor/assets/my_javascripts/bower_components
-js "backbone"
-js "moment"
+asset "backbone"
+asset "moment"
 ```
 
 And finally, the `assets_path` method can be overridden by an option in a `group` call:
@@ -91,28 +81,24 @@ assets_path "assets/javascript"
 
 # Puts files under ./vendor/assets/js/bower_components
 group :vendor, :assets_path => "assets/js"  do
-  js "jquery"            # Assummes it's latests
-  js "backbone", "1.2"
+  asset "jquery"            # Assummes it's latests
+  asset "backbone", "1.2"
 end
 
 # Puts files under ./lib/assets/javascript/bower_components
 group :lib do
-  js "jquery"
-  js "backbone", "1.2"
+  asset "jquery"
+  asset "backbone", "1.2"
 end
 ```
 NOTE: All the assets should be stored in `/assets` subdirectory so putting it under `./vendor/js` directory is unavailable
 
-**Available commands with a Jsfile**
-
-``` bash
-  rake bower:dsl:install #install js components
-  rake bower:dsl:install:force #install with force option
-  rake bower:dsl:update #update js components
-  rake bower:dsl:update:prune #update components and uninstall extraneous packages
-```
-
-
-
+##Rake tasks
 
+Once you are done with `bower.json` or `Bowerfile` you can run
 
+* `rake bower:install` to install js components
+* `rake bower:install:force` to install with force option
+* `rake bower:update` to update js components
+* `rake bower:update:prune` to update components and uninstall extraneous packages
+* `rake bower:list` to list all packages

data/lib/bower-rails/dsl.rb

@@ -3,20 +3,19 @@ require 'fileutils'
 
 module BowerRails
   class Dsl
-    cattr_accessor :config
-    attr_reader :dependencies
-
-    def self.evalute(file)
+    def self.evalute(filename)
       instance = new
-      instance.eval_file(file)
+      instance.eval_file(File.join(instance.root_path, filename))
       instance
     end
 
+    attr_reader :dependencies, :root_path
+
     def initialize
       @dependencies = {}
-      @groups = []
-      @root_path = BowerRails::Dsl.config[:root_path] ||  File.expand_path("./")
-      @assets_path = BowerRails::Dsl.config[:assets_path] ||  "assets"
+      @root_path ||= defined?(Rails) ? Rails.root : Dir.pwd
+      @assets_path ||= "assets"
+      @groups ||= [[:vendor, { assets_path: @assets_path }]]
     end
 
     def eval_file(file)
@@ -27,25 +26,25 @@ module BowerRails
       @dependencies.keys
     end
 
-    def group(*args, &blk)
+    def group(*args, &block)
       if args[1]
         custom_assets_path = args[1][:assets_path]
-        raise ArgumentError, "Assets should be stored in /assets directory, try :assets_path => 'assets/#{custom_assets_path}' instead" if custom_assets_path.match(/assets/).nil?
+        raise ArgumentError, "Assets should be stored in /assets directory, try :assets_path => 'assets/#{custom_assets_path}' instead" unless custom_assets_path.start_with?('assets', '/assets')
         new_group = [args[0], args[1]]
       else
         new_group = [args[0]]
       end
-      
+        
       @groups << new_group
-      yield
+
+      yield if block_given?
     end
 
-    def js(name, *args)
+    def asset(name, *args)
       version = args.first || "latest"
-      @groups = [[:vendor, { assets_path: @assets_path }]] if @groups.empty?
 
       @groups.each do |g|
-        g_norm = normalize_location_path(g.first.to_s, group_assets_path(g))
+        g_norm = normalize_location_path(g.first, group_assets_path(g))
         @dependencies[g_norm] ||= {}
         @dependencies[g_norm][name] = version
       end
@@ -65,7 +64,6 @@ module BowerRails
     end
 
     def write_dotbowerrc
-      @groups = [[:vendor, { assets_path: @assets_path }]] if @groups.empty?
       @groups.map do |g|
         File.open(File.join(g.first.to_s, group_assets_path(g), ".bowerrc"), "w") do |f|
           f.write(JSON.pretty_generate({:directory => "bower_components"}))
@@ -74,7 +72,6 @@ module BowerRails
     end
 
     def final_assets_path
-      @groups = [[:vendor, { assets_path: @assets_path }]] if @groups.empty? 
       @groups.map do |g|
         [g.first.to_s, group_assets_path(g)]
       end
@@ -95,13 +92,12 @@ module BowerRails
     end
 
     def assets_path(assets_path)
-      raise ArgumentError, "Assets should be stored in /assets directory, try assets_path 'assets/#{assets_path}' instead" if assets_path.match(/assets/).nil?
+      raise ArgumentError, "Assets should be stored in /assets directory, try assets_path 'assets/#{assets_path}' instead" unless assets_path.start_with?('assets', '/assets')
       @assets_path = assets_path
     end
 
     def normalize_location_path(loc, assets_path)
       File.join(@root_path, loc.to_s, assets_path)
     end
-
   end
 end

data/lib/bower-rails/railtie.rb

@@ -5,13 +5,13 @@ require 'rails'
 module BowerRails
   class Railtie < Rails::Railtie
     railtie_name :bower
+    @@bowerfile = File.join("Bowerfile")
 
-    if File.exist?(File.join("Jsfile"))
-      BowerRails::Dsl.config = {:root_path => Rails.root}
-      dsl = BowerRails::Dsl.evalute(File.join("Jsfile"))
-
+    if File.exist?(@@bowerfile)
       config.before_initialize do |app|
-        dsl.final_assets_path.map do |assets_root, assets_path|
+        @dsl = BowerRails::Dsl.evalute(@@bowerfile)
+
+        @dsl.final_assets_path.map do |assets_root, assets_path|
           app.config.assets.paths << Rails.root.join(assets_root, assets_path, "bower_components")
         end
       end

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

@@ -10,7 +10,6 @@ module BowerRails
       def create_initializer_file
         template "bower.json", 'bower.json'
       end
-
     end
   end
 end

data/lib/tasks/bower.rake

@@ -2,78 +2,56 @@ require 'json'
 require 'pp'
 
 namespace :bower do
-
-  desc "install components from bower"
+  desc "Install components from bower"
   task :install do
-    #install to corresponding directories
-    perform_command do
+    perform do
       sh 'bower install'
     end
   end
 
   namespace :install do
-    desc "install components with -F option"
+    desc "Install components with -F option"
     task :force do
-      perform_command do
+      perform do
         sh 'bower install -F'
       end
     end
   end
 
-  desc "update bower components"
+  desc "Update bower components"
   task :update do
-    #install to corresponding directories
-    perform_command false do
+    perform do
       sh 'bower update'
     end
   end
 
+  desc "List bower components"
+  task :list do
+    perform false do
+      sh 'bower list'
+    end
+  end  
+
   namespace :update do
-    desc "update existing components and uninstalls extraneous components"
+    desc "Update existing components and uninstalls extraneous components"
     task :prune do
-      perform_command false do
+      perform do
         sh 'bower update && bower prune'
       end
     end
   end
+end
 
-  namespace :dsl do
-    desc "install components from bower"
-    task :install do
-      #install to corresponding directories
-      dsl_perform_command do
-        sh 'bower install'
-      end
-    end
-
-    namespace :install do
-      desc "install components with -F option"
-      task :force do
-        dsl_perform_command do
-          sh 'bower install -F'
-        end
-      end
-    end
+def perform remove_components = true, &block
+  entries = Dir.entries(get_bower_root_path)
 
-    desc "update bower components"
-    task :update do
-      #install to corresponding directories
-      dsl_perform_command false do
-        sh 'bower update'
-      end
-    end
-
-    namespace :update do
-      desc "update existing components and uninstalls extraneous components"
-      task :prune do
-        dsl_perform_command false do
-          sh 'bower update && bower prune'
-        end
-      end
-    end
-    
+  if entries.include?('Bowerfile')
+    dsl_perform_command remove_components, &block
+  elsif entries.include?('bower.json')
+    perform_command remove_components, &block
+  else
+    raise LoadError, "No Bowerfile or bower.json file found. Make sure you have it at the root of your project"
   end
-
 end
 
 def get_bower_root_path
@@ -84,10 +62,8 @@ def get_bower_root_path
   end
 end
 
-def dsl_perform_command remove_components = true
-  bower_root = get_bower_root_path
-  BowerRails::Dsl.config = {:root_path => bower_root}
-  dsl = BowerRails::Dsl.evalute(File.join(bower_root, "Jsfile"))
+def dsl_perform_command remove_components = true, &block
+  dsl = BowerRails::Dsl.evalute("Bowerfile")
 
   if remove_components
     dsl.write_bower_json
@@ -95,15 +71,17 @@ def dsl_perform_command remove_components = true
     puts "bower.js files generated"
   end
 
-  dsl.directories.each do |dir|
-    Dir.chdir(dir) do
-      yield
+  if block_given?
+    dsl.directories.each do |dir|
+      Dir.chdir(dir) do
+        yield
+      end
     end
   end
 end
 
 #run the passed bower block in appropriate folders
-def perform_command remove_components = true
+def perform_command remove_components = true, &block
   bower_root = get_bower_root_path
   #load in bower json file
   txt  = File.read(File.join(bower_root, "bower.json"))
@@ -133,7 +111,7 @@ def perform_command remove_components = true
       end
 
       #run command
-      yield
+      yield  if block_given?
 
       #remove bower file
       FileUtils.rm("bower.json")

metadata

@@ -1,31 +1,60 @@
 --- !ruby/object:Gem::Specification
 name: bower-rails
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.0
 platform: ruby
 authors:
 - Ross Harrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-08 00:00:00.000000000 Z
-dependencies: []
+date: 2013-09-23 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Rails integration for bower.
 email: rtharrison86@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/bower-rails/dsl.rb
 - lib/bower-rails/railtie.rb
+- lib/bower-rails/dsl.rb
 - lib/bower-rails.rb
-- lib/generators/bower_rails/initialize/initialize_generator.rb
 - lib/generators/bower_rails/initialize/templates/bower.json
+- lib/generators/bower_rails/initialize/initialize_generator.rb
 - lib/tasks/bower.rake
 - MIT-LICENSE
 - README.md
 homepage: https://github.com/rharriso/bower-rails
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -48,3 +77,4 @@ signing_key:
 specification_version: 4
 summary: Bower for Rails
 test_files: []
+has_rdoc: