bundler-bower 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12b871ccc9ca1ac06ece906a8c49d7d0d44a421e
-  data.tar.gz: ac02c42269b8081cd3d0bf109e374c7ca693856a
+  metadata.gz: dab3062b273a3559721269ab8a2040de70845b62
+  data.tar.gz: 6fdafce4ee50981b672e248f393a0b083cb315c2
 SHA512:
-  metadata.gz: 8770cf4e380fd5a72816bb518fccda9d4e119551a556aacc364e91ef7f0cd1c64fa442f35739e9f831d8c7bd1441e1c59884712d667e3f83384fb0c1eb53ae05
-  data.tar.gz: 4ed73de006241580beffe12cc3f1daad527ad4bd6ab063076e429324939ada5049b52fd4e0240beb5bcc4cd1264d480fc6a66e7de4a4411edb9bc640e863d7da
+  metadata.gz: ca0e3e5c8a39656cb37e2909840a45aae104b55691f880513241bdb09d8a9f4bf005e2ecb369caee39f6d29085e4bc4fcd05d2875465487f4789eca6e3fd8d86
+  data.tar.gz: 3a620311a687aadefa967187e2262c969a33bc1bb6ecfc044f34646cd9f914d032f3bcbc694bd78f72e31a1963c1e6bb7ca8d29a53b3fcefe99f3de442bd8720

data/.travis.yml

@@ -2,6 +2,7 @@ before_script:
   - npm install -g bower
 rvm:
   - 2.0.0
+  - 1.9
   - ruby-head
   - jruby-head
   - jruby-19mode

data/README.md

@@ -11,8 +11,9 @@ Bower support for bundler. You can use assets from bower directly in `Gemfile`
 
 ### Requirements
 
-* bower
-* ruby 2.0 (or with `Module#prepend` support)
+* [node](http://nodejs.org)
+* [bower](https://github.com/bower/bower) (>= 0.10.0) installed with npm
+* ruby >= 1.9
 
 ## Installation
 
@@ -37,39 +38,116 @@ Add to your Gemfile require method.
 source 'https://rubygems.org'
 require 'bundler/bower'
 
-gem 'rake'
+# ...
+```
+
+You can use DSL from [bower-rails](https://github.com/42dev/bower-rails). Click [here](https://github.com/42dev/bower-rails#ruby-dsl-configuration) for details.
+
+### Usage with Gemfile
+
+You can use `asset` method directly in your Gemfile.
+
+```ruby
+# Gemfile
+source 'https://rubygems.org'
+require 'bundler/bower'
+
+gem 'rails'
+asset 'backbone', '0.9'
+```
+
+### Usage with Bowerfile
+
+You can use `Bowerfile` from [bower-rails](https://github.com/42dev/bower-rails). This file should be in the same directory as the `Gemfile`.
+
+```ruby
+# Gemfile
+source 'https://rubygems.org'
+require 'bundler/bower'
+
+gem 'rails'
+```
+
+And `Bowerfile`
+
+```ruby
+# Bowerfile
+
+asset 'backbone', '0.9'
+```
 
-asset 'backbone', "0.9"
-asset 'moment'
+### Usage with bower.json
+
+You can use `bower.json` from [bower-rails](https://github.com/42dev/bower-rails). This file should be in the same directory as the `Gemfile`.
+
+```ruby
+# Gemfile
+source 'https://rubygems.org'
+require 'bundler/bower'
+
+gem 'rails'
 ```
 
-You can use DSL from [bower-rails](https://github.com/42dev/bower-rails). Click [here](https://github.com/42dev/bower-rails#ruby-dsl-configuration) for details. Only `group` method is not supported.
+And `bower.json`
 
-And just execute `bundle install`.
+```ruby
+# bower.json
+{
+  "vendor": {
+    "name": "bower-rails generated vendor assets",
+    "dependencies": {
+      "backbone"    : "0.9"
+    }
+  }
+}
+```
+
+## Install dependencies
+
+Just execute `bundle install`.
 
 ```
 Using rake (10.1.0)
 Using bundler (1.3.5)
 bower backbone#0.9              cached git://github.com/jashkenas/backbone.git#0.9.10
 bower backbone#0.9            validate 0.9.10 against git://github.com/jashkenas/backbone.git#0.9
-bower moment#*                  cached git://github.com/timrwood/moment.git#2.4.0
-bower moment#*                validate 2.4.0 against git://github.com/timrwood/moment.git#*
-bower moment#*                 install moment#2.4.0
 bower backbone#0.9             install backbone#0.9.10
 
-moment#2.4.0 bower_components/moment
-
 backbone#0.9.10 bower_components/backbone
 bower check-new     Checking for new versions of the project dependencies..
 dsl-generated dependencies /home/lite/work/bundler-bower/spec/dummy/vendor/assets
 ├── backbone#0.9.10 (latest is 1.1.0)
-└── moment#2.4.0
 Your bundle is complete!
 Use `bundle show [gemname]` to see where a bundled gem is installed.
 ```
 
 When you execute `bundle` or `bundle install` bundler-bower will execute `bower install`. But when you execute `bundle update` bundler-bower will execute `bower update`. When bundler quits you can find your assets in `vendor/assets/bower_components`. Of course you can change this directory by `assets_path` method.
 
+## Configure asset pipeline
+
+```ruby
+# config/application.rb
+
+# include Bower components in compiled assets
+config.assets.paths << Rails.root.join('vendor', 'assets', 'bower_components')
+```
+
+Update your `application.js` file
+
+```
+// app/assets/javascripts/application.js
+//
+// Bower packages
+//= require backbone/backbone
+//
+// Other components
+//= require jquery
+//= require jquery_ujs
+// ...
+```
+
+ENJOY!
+
 ## Contributing
 
 1. Fork it
@@ -77,3 +155,7 @@ When you execute `bundle` or `bundle install` bundler-bower will execute `bower
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+
+
+[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/LTe/bundler-bower/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
+

data/lib/bundler/bower.rb

@@ -6,5 +6,5 @@ require "bundler/bower/fake_dsl/bower-rails"
 require "bundler/bower/bundler_installer"
 
 Bundler::Dsl.send(:include, Bundler::Bower::FakeDsl::Bundler)
-BowerRails::Dsl.send(:prepend, Bundler::Bower::FakeDsl::BowerRails)
-Bundler::Installer.send(:prepend, Bundler::Bower::BundlerInstaller)
+BowerRails::Dsl.send(:include, Bundler::Bower::FakeDsl::BowerRails)
+Bundler::Installer.send(:include, Bundler::Bower::BundlerInstaller)

data/lib/bundler/bower/bundler_installer.rb

@@ -3,10 +3,16 @@ require 'bundler/bower/rake'
 module Bundler
   module Bower
     module BundlerInstaller
-      def run(options)
-        result = super
-        Bundler::Bower::Rake.new(options).perform
-        result
+      def self.included(base)
+        base.class_eval do
+          alias :old_run :run
+
+          def run(options)
+            result = old_run(options)
+            Bundler::Bower::Rake.new(options).perform
+            result
+          end
+        end
       end
     end
   end

data/lib/bundler/bower/rake.rb

@@ -4,12 +4,27 @@ require 'bower-rails'
 module Bundler
   module Bower
     class Rake
+      DEPENDENCY_FILES = %w{bower.json Bowerfile Gemfile}.freeze
+
       def initialize(options)
         @options = options
       end
 
+      def dependency_file
+        entries = Dir.entries(Dir.pwd)
+        DEPENDENCY_FILES.detect { |file| entries.include?(file) }
+      end
+
       def perform
-        dsl = BowerRails::Dsl.evalute("Gemfile")
+        case dependency_file
+          when "Gemfile"    then perform_dsl("Gemfile")
+          when "Bowerfile"  then perform_dsl("Bowerfile")
+          when "bower.json" then perform_json
+        end
+      end
+
+      def perform_dsl(file)
+        dsl = BowerRails::Dsl.evalute(file)
 
         dsl.write_bower_json
         dsl.write_dotbowerrc
@@ -22,6 +37,42 @@ module Bundler
         end
       end
 
+      def perform_json(remove_components = true)
+        bower_root  = Dir.pwd
+        json        = JSON.parse(File.read(File.join(bower_root, "bower.json")))
+        dot_bowerrc = JSON.parse(File.read(File.join(bower_root, '.bowerrc'))) rescue {}
+
+        dot_bowerrc["directory"] = "bower_components"
+
+        if (json.keys - ['lib', 'vendor']).empty?
+          folders = json.keys
+        else
+          raise "Assuming a standard bower package but cannot find the required 'name' key" unless !!json['name']
+          folders = ['vendor']
+        end
+
+        folders.each do |dir|
+          puts "\nInstalling dependencies into #{dir}"
+          data = json[dir]
+          data = json if data.nil?
+
+          dir = File.join(bower_root, dir, "assets")
+          FileUtils.mkdir_p dir unless File.directory? dir
+
+          Dir.chdir(dir) do
+            FileUtils.rm_rf("bower_components") if remove_components
+            File.open("bower.json", "w") { |f| f.write(data.to_json) }
+            File.open(".bowerrc", "w") { |f| f.write(JSON.pretty_generate(dot_bowerrc)) }
+
+            system(command)
+            system('bower list')
+
+            FileUtils.rm("bower.json")
+            FileUtils.rm(".bowerrc")
+          end if data && !data["dependencies"].empty?
+        end
+      end
+
       def update?
         @options["update"]
       end

data/lib/bundler/bower/version.rb

@@ -1,5 +1,5 @@
 module Bundler
   module Bower
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/spec/bundler/bower/integration_spec.rb

@@ -1,13 +1,32 @@
 require 'spec_helper'
 
 describe "Integration test" do
-  let(:directory) { File.join(File.dirname(__FILE__), "../../dummy") }
   let(:test_node) { TestNode.new(:gemfile => "#{directory}/Gemfile", :type => "install") }
 
   before { Dir.chdir(directory) { test_node.spawn } }
   after  { FileUtils.rm_rf("#{ directory}/vendor") }
 
-  it "download backbone" do
-    File.exist?("#{directory}/vendor/assets/bower_components/backbone/backbone.js").should be_true
+  describe "Gemfile" do
+    let(:directory) { File.join(File.dirname(__FILE__), "../../dummy") }
+
+    it "download backbone" do
+      File.exist?("#{directory}/vendor/assets/bower_components/backbone/backbone.js").should be_true
+    end
+  end
+
+  describe "Bowerfile" do
+    let(:directory) { File.join(File.dirname(__FILE__), "../../dummy_bowerfile") }
+
+    it "download backbone" do
+      File.exist?("#{directory}/vendor/assets/bower_components/backbone/backbone.js").should be_true
+    end
+  end
+
+  describe "bower.json" do
+    let(:directory) { File.join(File.dirname(__FILE__), "../../dummy_bower_json") }
+
+    it "download backbone" do
+      File.exist?("#{directory}/vendor/assets/bower_components/backbone/backbone.js").should be_true
+    end
   end
 end

data/spec/bundler/bower/rake_spec.rb

@@ -5,6 +5,60 @@ module Bundler::Bower
     let(:options) { {} }
     subject { Rake.new(options) }
 
+    describe "recognize dependency file" do
+      before { stub(Dir).entries(any_args) { files } }
+
+      context "only Gemfile" do
+        let(:files) { ["Gemfile", "other-file" ].shuffle }
+
+        it "returns Gemfile as dependency file" do
+          subject.dependency_file.should == "Gemfile"
+        end
+      end
+
+      context "Bowerfile and Gemfile" do
+        let(:files) { ["Gemfile", "Bowerfile", "other-file" ].shuffle }
+
+        it "returns Bowerfile" do
+          subject.dependency_file.should == "Bowerfile"
+        end
+      end
+
+      context "bower.json, Bowerfile and Gemfile" do
+        let(:files) { ["Gemfile", "Bowerfile", "bower.json", "other-file" ].shuffle }
+
+        it "returns bower.json" do
+          subject.dependency_file.should == "bower.json"
+        end
+      end
+    end
+
+    describe "stategy for DSL and .json format" do
+      describe "for DSL" do
+        ["Gemfile", "Bowerfile"].each do |file|
+          describe file do
+            before { stub(subject).dependency_file { file }  }
+
+            it "execute DSL strategy for #{file}" do
+              mock(subject).perform_dsl(file)
+              subject.perform
+            end
+          end
+        end
+      end
+
+      describe "for .json file" do
+        describe "bower.json" do
+          before { stub(subject).dependency_file { "bower.json" }  }
+
+          it "execute standard strategy for bower.json" do
+            mock(subject).perform_json
+            subject.perform
+          end
+        end
+      end
+    end
+
     describe "during bundle (install)" do
       describe "#update?" do
         it "returns false" do

data/spec/dummy_bower_json/Bowerfile

@@ -0,0 +1 @@
+asset 'moment'

data/spec/dummy_bower_json/Gemfile

@@ -0,0 +1,4 @@
+$LOAD_PATH << File.dirname(__FILE__) + '/../../lib'
+require 'bundler/bower'
+
+gem 'rake'

data/spec/dummy_bower_json/bower.json

@@ -0,0 +1,8 @@
+{
+  "vendor": {
+    "name": "bower-rails generated vendor assets",
+    "dependencies": {
+      "backbone"    : "0.9"
+    }
+  }
+}

data/spec/dummy_bowerfile/Bowerfile

@@ -0,0 +1,2 @@
+asset 'backbone', "0.9"
+asset 'moment'

data/spec/dummy_bowerfile/Gemfile

@@ -0,0 +1,4 @@
+$LOAD_PATH << File.dirname(__FILE__) + '/../../lib'
+require 'bundler/bower'
+
+gem 'rake'

data/spec/spec_helper.rb

@@ -13,4 +13,5 @@ Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
 Bogus.configure do |c|
   c.search_modules << BowerRails
+  c.search_modules << Bundler::Bower
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bundler-bower
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Piotr Niełacny
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-01 00:00:00.000000000 Z
+date: 2013-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bower-rails
@@ -75,6 +75,11 @@ files:
 - spec/bundler/bower/integration_spec.rb
 - spec/bundler/bower/rake_spec.rb
 - spec/dummy/Gemfile
+- spec/dummy_bower_json/Bowerfile
+- spec/dummy_bower_json/Gemfile
+- spec/dummy_bower_json/bower.json
+- spec/dummy_bowerfile/Bowerfile
+- spec/dummy_bowerfile/Gemfile
 - spec/spec_helper.rb
 - spec/support/test_node.rb
 homepage: https://github.com/LTe/bundler-bower
@@ -97,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: integration bundler with bower
@@ -105,5 +110,10 @@ test_files:
 - spec/bundler/bower/integration_spec.rb
 - spec/bundler/bower/rake_spec.rb
 - spec/dummy/Gemfile
+- spec/dummy_bower_json/Bowerfile
+- spec/dummy_bower_json/Gemfile
+- spec/dummy_bower_json/bower.json
+- spec/dummy_bowerfile/Bowerfile
+- spec/dummy_bowerfile/Gemfile
 - spec/spec_helper.rb
 - spec/support/test_node.rb