vendorise 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e5cae912a9bd5f013c43802064dabca1f78cb0f
-  data.tar.gz: b26e429ca1191a918db36407ec765eb1e72779ac
+  metadata.gz: 71fc0702ccecbcf00c3ac4fe2f66dfe8f405129c
+  data.tar.gz: 906e46e59a64be9defc2857adba66e40fd58e6b2
 SHA512:
-  metadata.gz: 1728664bc30325c19ddb74ae8a890187d888ebc2f3b94a5c120f8731f225aa314aecf041926750aadb7ad4f72cca684587916025cd0541adf8e3a445953f90b5
-  data.tar.gz: 6ee71f91f8c51043cac76db62d12d183c277c8be93acb3180d19bc6f01642790904e58d47027b51b24aa6990e1a5c95dac05b03959eb2a2f5303eabf7984bdf1
+  metadata.gz: 8a230aee1a198f2c322440afc3af3c349d3634910b683845e71d59cb7f28d490ae497d4527c7a5924d0da117339ec46ee1b145e9b80e4a859c5cc2cc59facd50
+  data.tar.gz: c12576e097bddb15168f026a7fb8aeecd52c51995808bb63c9fd0a0c35976b74e97964be7c08be5e430aeaddb44aa867ced7d3f7b4c7a32ec4f0958ab0a5a9f9

data/lib/vendorise/arborist.rb

@@ -0,0 +1,19 @@
+module Vendorise
+  class Arborist
+    attr_reader :path, :url
+
+    def initialize(path, url)
+      @path = path
+      @url = url
+    end
+
+    def subtree_already_exists?
+      Dir.exist?(path)
+    end
+
+    def subtree_command
+      cmd = subtree_already_exists? ? "pull" : "add"
+      "git subtree #{cmd} --prefix #{path} #{url} master --squash"
+    end
+  end
+end

data/lib/vendorise/parser.rb

@@ -1,15 +1,17 @@
 module Vendorise
   class Parser
+    attr_reader :url
 
-    class << self
-      def gem_url(url)
-        url =~ /^\s+$/ ? nil : url
-      end
+    def initialize(url)
+      @url = url
+    end
 
-      def gem_name(url)
-        File.basename url, ".git"
-      end
+    def gem_url
+      url =~ /^\s+$/ ? nil : url
     end
 
+    def gem_name
+      File.basename url, ".git"
+    end
   end
 end

data/lib/vendorise/tasks.rb

@@ -1,13 +1,15 @@
 require "rake"
 require_relative "parser"
+require_relative "arborist"
 
 namespace :vendorise do
   desc "Installs a gem from the specified url to /vendor/gems"
   task :gem, :url do |t, args|
-    url = Vendorise::Parser.gem_url(args[:url]) or raise "Please specify a valid url for the gem"
-    path = "vendor/gems/#{Vendorise::Parser.gem_name(args[:url])}"
-    cmd = Dir.exist?(path) ? "pull" : "add"
+    parser = Vendorise::Parser.new(args[:url])
+    url = parser.gem_url or raise "Please specify a valid url for the gem"
 
-    system("git subtree #{cmd} --prefix #{path} #{url} master --squash")
+    command = Vendorise::Arborist.new("vendor/gems/#{parser.gem_name}", url).subtree_command
+
+    system(command)
   end
 end

data/lib/vendorise/version.rb

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

data/spec/lib/vendorise/arborist_spec.rb

@@ -0,0 +1,26 @@
+require_relative "../../spec_helper"
+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" }
+
+      context "when #subtree_already_exists? is false" do
+        before { allow(subject).to receive(:subtree_already_exists?).and_return(false) }
+
+        it "is 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) }
+
+        it "is 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
+    end
+  end
+end

data/spec/lib/vendorise/parser_spec.rb

@@ -1,33 +1,33 @@
-require_relative "../../spec_helper.rb"
+require_relative "../../spec_helper"
 require_relative "../../../lib/vendorise/parser"
 
 module Vendorise
   describe Parser do
     describe :gem_url do
       it "is nil for pure whitespace urls" do
-        expect(Vendorise::Parser.gem_url("     ")).to eq nil
+        expect(Parser.new("     ").gem_url).to eq nil
       end
 
       it "is nil for nil urls" do
-        expect(Vendorise::Parser.gem_url(nil)).to eq nil
+        expect(Parser.new(nil).gem_url).to eq nil
       end
 
       it "is a http url for a http url" do
-        expect(Vendorise::Parser.gem_url("https://github.com/New-Bamboo/vendorise.git")).to eq "https://github.com/New-Bamboo/vendorise.git"
+        expect(Parser.new("https://github.com/New-Bamboo/vendorise.git").gem_url).to eq "https://github.com/New-Bamboo/vendorise.git"
       end
 
       it "is a ssh url for a ssh url" do
-        expect(Vendorise::Parser.gem_url("git@github.com:New-Bamboo/vendorise.git")).to eq "git@github.com:New-Bamboo/vendorise.git"
+        expect(Parser.new("git@github.com:New-Bamboo/vendorise.git").gem_url).to eq "git@github.com:New-Bamboo/vendorise.git"
       end
     end
 
     describe :gem_name do
       it "is the last part of the path for a http url" do
-        expect(Vendorise::Parser.gem_name("https://github.com/New-Bamboo/vendorise.git")).to eq "vendorise"
+        expect(Parser.new("https://github.com/New-Bamboo/vendorise.git").gem_name).to eq "vendorise"
       end
 
       it "is the last part of the path for a ssh url" do
-        expect(Vendorise::Parser.gem_name("git@github.com:New-Bamboo/vendorise.git")).to eq "vendorise"
+        expect(Parser.new("git@github.com:New-Bamboo/vendorise.git").gem_name).to eq "vendorise"
       end
     end
   end

data/spec/lib/vendorise/tasks_spec.rb

@@ -12,5 +12,15 @@ module Vendorise
     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")
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vendorise
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Iain Beeston
@@ -66,9 +66,11 @@ files:
 - README.md
 - Rakefile
 - lib/vendorise.rb
+- lib/vendorise/arborist.rb
 - lib/vendorise/parser.rb
 - lib/vendorise/tasks.rb
 - lib/vendorise/version.rb
+- spec/lib/vendorise/arborist_spec.rb
 - spec/lib/vendorise/parser_spec.rb
 - spec/lib/vendorise/tasks_spec.rb
 - spec/spec_helper.rb
@@ -98,6 +100,7 @@ signing_key:
 specification_version: 4
 summary: Uses git subtree to download the source for a gem into /vendor/gems
 test_files:
+- spec/lib/vendorise/arborist_spec.rb
 - spec/lib/vendorise/parser_spec.rb
 - spec/lib/vendorise/tasks_spec.rb
 - spec/spec_helper.rb