vendorise 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71fc0702ccecbcf00c3ac4fe2f66dfe8f405129c
-  data.tar.gz: 906e46e59a64be9defc2857adba66e40fd58e6b2
+  metadata.gz: ee24cab1f977ae4b06b7a2b3df21bb6af37d6fb5
+  data.tar.gz: 92026fd2c0f054e609a8006ca08ff20f8fafc8cc
 SHA512:
-  metadata.gz: 8a230aee1a198f2c322440afc3af3c349d3634910b683845e71d59cb7f28d490ae497d4527c7a5924d0da117339ec46ee1b145e9b80e4a859c5cc2cc59facd50
-  data.tar.gz: c12576e097bddb15168f026a7fb8aeecd52c51995808bb63c9fd0a0c35976b74e97964be7c08be5e430aeaddb44aa867ced7d3f7b4c7a32ec4f0958ab0a5a9f9
+  metadata.gz: c23f6adf41ac307fa4f17ede9a8455ed77f5a8466a3f4e543a9489e4e637735c8bd87eda17162b9fc60c318ffd7946319f3b5c22478c718cb448012ef40529d0
+  data.tar.gz: 7ca3d7d635936ff7e23ac6d1261e1276d463df262f6999bf99729a4f43ac9bf31c8affc3edb96f03f9b7dda6014abd95bab3324449fb133e90a9faa5b6247025

data/README.md

@@ -1,7 +1,7 @@
 # Vendorise
 
-[![Gem Version](https://badge.fury.io/rb/vendorise.png)](http://badge.fury.io/rb/vendorise)
-[![Build Status](https://travis-ci.org/New-Bamboo/vendorise.png)](https://travis-ci.org/New-Bamboo/vendorise)
+[![Gem Version](http://img.shields.io/gem/v/vendorise.svg)](http://rubygems.org/gems/vendorise)
+[![Build Status](http://img.shields.io/travis/iainbeeston/vendorise/master.svg)](https://travis-ci.org/iainbeeston/vendorise)
 
 Sometimes you need to use a gem that is only available in a private git repository. There are a few ways to do this:
 
@@ -27,8 +27,12 @@ Or if you don't use bundler:
 
 ## Usage
 
-1. Run `rake vendorise:gem[repo_url]` to vendorise the gem hosted at `repo_url` into `/vendor/gems`.
+1. Run `rake "vendorise:gem[repo_url]"` to vendorise the gem hosted at `repo_url` into `/vendor/gems`.
 2. Add `gem '<gem_name>', path: 'vendor/gems/<gem_name>'` to your Gemfile
 
-You can update the gem at any time by running the rake task again. Vendorise always uses the code from the master branch on git (tags are not supported yet).
+You can update the gem at any time by running the rake task again.
+
+By default the `vendorise:gem` rake task will use the master branch. To use another branch (or tag) specify it as the second parameter, like this:
+
+    rake "vendorise:gem[repo_url, branch]"
 

data/lib/vendorise/arborist.rb

@@ -1,10 +1,11 @@
 module Vendorise
   class Arborist
-    attr_reader :path, :url
+    attr_reader :path, :url, :branch
 
-    def initialize(path, url)
+    def initialize(path, url, branch)
       @path = path
       @url = url
+      @branch = branch
     end
 
     def subtree_already_exists?
@@ -13,7 +14,7 @@ module Vendorise
 
     def subtree_command
       cmd = subtree_already_exists? ? "pull" : "add"
-      "git subtree #{cmd} --prefix #{path} #{url} master --squash"
+      "git subtree #{cmd} --prefix #{path} #{url} #{branch} --squash"
     end
   end
 end

data/lib/vendorise/tasks.rb

@@ -4,12 +4,14 @@ require_relative "arborist"
 
 namespace :vendorise do
   desc "Installs a gem from the specified url to /vendor/gems"
-  task :gem, :url do |t, args|
+  task :gem, [:url, :branch] do |t, args|
+    args.with_defaults(branch: "master")
     parser = Vendorise::Parser.new(args[:url])
     url = parser.gem_url or raise "Please specify a valid url for the gem"
+    branch = args[:branch]
 
-    command = Vendorise::Arborist.new("vendor/gems/#{parser.gem_name}", url).subtree_command
+    command = Vendorise::Arborist.new("vendor/gems/#{parser.gem_name}", url, branch).subtree_command
 
-    system(command)
+    sh(command)
   end
 end

data/lib/vendorise/version.rb

@@ -1,3 +1,3 @@
 module Vendorise
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/spec/lib/vendorise/arborist_spec.rb

@@ -3,21 +3,31 @@ require_relative "../../../lib/vendorise/arborist"
 
 module Vendorise
   describe Arborist do
-    describe :subtree_command do
-      subject { Arborist.new "foo/bar", "git@github.com:New-Bamboo/vendorise.git" }
+    let(:subtree_already_exists?) { false }
 
-      context "when #subtree_already_exists? is false" do
-        before { allow(subject).to receive(:subtree_already_exists?).and_return(false) }
+    before { allow(subject).to receive(:subtree_already_exists?).and_return(subtree_already_exists?) }
 
-        it "is git subtree add" do
+    context "when branch is specified in the constructor" do
+      subject { Arborist.new "foo/bar", "git@github.com:New-Bamboo/vendorise.git", "development" }
+
+      it "makes #subtree_command use that branch" do
+        expect(subject.subtree_command).to eq "git subtree add --prefix foo/bar git@github.com:New-Bamboo/vendorise.git development --squash"
+      end
+    end
+
+    describe :subtree_already_exists? do
+      subject { Arborist.new "foo/bar", "git@github.com:New-Bamboo/vendorise.git", "master" }
+
+      context "is false" do
+        it "makes #subtree_command use 'git subtree add'" do
           expect(subject.subtree_command).to eq "git subtree add --prefix foo/bar git@github.com:New-Bamboo/vendorise.git master --squash"
         end
       end
 
-      context "when #subtree_already_exists? is true" do
-        before { allow(subject).to receive(:subtree_already_exists?).and_return(true) }
+      context "is true" do
+        let(:subtree_already_exists?) { true }
 
-        it "is git subtree pull" do
+        it "makes #subtree_command use 'git subtree pull'" do
           expect(subject.subtree_command).to eq "git subtree pull --prefix foo/bar git@github.com:New-Bamboo/vendorise.git master --squash"
         end
       end

data/spec/lib/vendorise/tasks_spec.rb

@@ -10,17 +10,7 @@ module Vendorise
     end
 
     it "accepts a url argument" do
-      expect(task.arg_names).to match_array [:url]
-    end
-
-    it "creates a new arborist and passes it's command to system" do
-      fake_arborist = double("Arborist", subtree_command: "touch foo.tmp")
-      allow(Vendorise::Arborist).to receive(:new).with("vendor/gems/vendorise", "git@github.com:New-Bamboo/vendorise.git").and_return(fake_arborist)
-
-      task.invoke("git@github.com:New-Bamboo/vendorise.git")
-
-      expect(File.exist?("foo.tmp")).to be true
-      File.delete("foo.tmp")
+      expect(task.arg_names).to match_array [:url, :branch]
     end
   end
 end

data/spec/lib/vendorise_spec.rb

@@ -0,0 +1,15 @@
+require_relative "../spec_helper"
+require_relative "../../lib/vendorise"
+
+describe "vendorise" do
+  it "adds a rake task to run git subtree", :clear_mocks do
+    expect_any_instance_of(Rake::FileUtilsExt).to receive(:sh).with("git subtree add --prefix vendor/gems/sinatra git@github.com:sinatra/sinatra.git master --squash")
+    Rake.application.invoke_task "vendorise:gem[git@github.com:sinatra/sinatra.git]"
+  end
+
+  it "uses the (optional) second argument to select the branch", :clear_mocks do
+    expect_any_instance_of(Rake::FileUtilsExt).to receive(:sh).with("git subtree add --prefix vendor/gems/sinatra git@github.com:sinatra/sinatra.git 1.3.x --squash")
+    Rake.application.invoke_task "vendorise:gem[git@github.com:sinatra/sinatra.git, 1.3.x]"
+  end
+end
+

data/spec/spec_helper.rb

@@ -2,4 +2,13 @@ RSpec.configure do |config|
   config.order = 'random'
   config.expect_with(:rspec){ |c| c.syntax = :expect }
   config.mock_with(:rspec){ |c| c.syntax = :expect }
+
+  # don't complain that I'm using symbols as metadata...
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+  # reseting the mock space doesn't seem to work on jruby
+  config.filter_run_excluding :clear_mocks if RUBY_ENGINE == "jruby"
+  config.after(:each, :clear_mocks) do
+    # expect_any_instance_of hangs around between specs
+    RSpec::Mocks.space.reset_all
+  end
 end

data/vendorise.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["iain.beeston@gmail.com"]
   spec.description   = %q{A reusable rake task to vendorise a gem hosted in a private git repo}
   spec.summary       = %q{Uses git subtree to download the source for a gem into /vendor/gems}
-  spec.homepage      = "http://github.com/New-Bamboo/vendorise"
+  spec.homepage      = "http://github.com/iainbeeston/vendorise"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vendorise
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Iain Beeston
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-11 00:00:00.000000000 Z
+date: 2014-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -73,9 +73,10 @@ files:
 - spec/lib/vendorise/arborist_spec.rb
 - spec/lib/vendorise/parser_spec.rb
 - spec/lib/vendorise/tasks_spec.rb
+- spec/lib/vendorise_spec.rb
 - spec/spec_helper.rb
 - vendorise.gemspec
-homepage: http://github.com/New-Bamboo/vendorise
+homepage: http://github.com/iainbeeston/vendorise
 licenses:
 - MIT
 metadata: {}
@@ -103,4 +104,5 @@ test_files:
 - spec/lib/vendorise/arborist_spec.rb
 - spec/lib/vendorise/parser_spec.rb
 - spec/lib/vendorise/tasks_spec.rb
+- spec/lib/vendorise_spec.rb
 - spec/spec_helper.rb