vanagon 0.7.1 → 0.8.0

data/spec/lib/vanagon/project/dsl_spec.rb

@@ -6,14 +6,29 @@ describe 'Vanagon::Project::DSL' do
   let (:project_block) {
 "project 'test-fixture' do |proj|
 end" }
-  let (:configdir) { '/a/b/c' }
+  let(:configdir) { '/a/b/c' }
 
   describe '#version_from_git' do
     it 'sets the version based on the git describe' do
       expect(Vanagon::Driver).to receive(:configdir).and_return(configdir)
       proj = Vanagon::Project::DSL.new('test-fixture', {})
       proj.instance_eval(project_block)
-      expect(Vanagon::Utilities).to receive(:git_version).with(File.expand_path('..', configdir)).and_return('1.2.3-1234')
+
+      # Lying is bad. You shouldn't lie. But sometimes when you're
+      # working with gross abstractions piled into the shape of
+      # an indescribable cyclopean obelisk, you might have to lie
+      # a little bit. Instead of trying to mock an entire Git instance,
+      # we'll just instantiate a Double and allow it to receive calls
+      # to .describe like it was a valid Git instance.
+      repo = double("repo")
+      expect(::Git)
+        .to receive(:open)
+        .and_return(repo)
+
+      allow(repo)
+        .to receive(:describe)
+        .and_return('1.2.3-1234')
+
       proj.version_from_git
       expect(proj._project.version).to eq('1.2.3.1234')
     end
@@ -21,7 +36,17 @@ end" }
       expect(Vanagon::Driver).to receive(:configdir).and_return(configdir)
       proj = Vanagon::Project::DSL.new('test-fixture', {})
       proj.instance_eval(project_block)
-      expect(Vanagon::Utilities).to receive(:git_version).with(File.expand_path('..', configdir)).and_return('1.2.3---1234')
+
+      # See previous description of "indescribable cyclopean obelisk"
+      repo = double("repo")
+      expect(::Git)
+        .to receive(:open)
+        .and_return(repo)
+
+      expect(repo)
+        .to receive(:describe)
+        .and_return('1.2.3---1234')
+
       proj.version_from_git
       expect(proj._project.version).to eq('1.2.3.1234')
     end

data/spec/lib/vanagon/utilities_spec.rb

@@ -52,50 +52,6 @@ describe "Vanagon::Utilities" do
     end
   end
 
-  describe "#is_git_repo?" do
-    let(:dir) { Dir.mktmpdir }
-    after(:each) { FileUtils.rm_rf(dir) }
-
-    it "returns false if not in a git repo" do
-      expect(Vanagon::Utilities.is_git_repo?(dir)).to be(false)
-    end
-
-    it "returns true if in a git repo" do
-      Dir.chdir(dir) do
-        Vanagon::Utilities.git('init')
-      end
-
-      expect(Vanagon::Utilities.is_git_repo?(dir)).to be(true)
-    end
-  end
-
-  describe "#git_version" do
-    let(:dir) { Dir.mktmpdir }
-    after(:each) { FileUtils.rm_rf(dir) }
-
-    it "raises an exception if not in a git repo" do
-      expect { Vanagon::Utilities.git_version(dir) }.to raise_error(RuntimeError)
-    end
-
-    it "returns a git tag based version if there are tags in the repo" do
-      Dir.chdir(dir) do
-        Vanagon::Utilities.git('init')
-        Vanagon::Utilities.git('commit --allow-empty -m "testing this ish"')
-        Vanagon::Utilities.git('tag 1.2.3')
-      end
-
-      expect(Vanagon::Utilities.git_version(dir)).to eq('1.2.3')
-    end
-
-    it "returns empty string if there are no tags" do
-      Dir.chdir(dir) do
-        Vanagon::Utilities.git('init')
-      end
-
-      expect(Vanagon::Utilities.git_version(dir)).to be_empty
-    end
-  end
-
   describe '#ssh_command' do
     it 'adds the correct flags to the command if VANAGON_SSH_KEY is set' do
       expect(Vanagon::Utilities).to receive(:find_program_on_path).with('ssh').and_return('/tmp/ssh')

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: vanagon
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-01 00:00:00.000000000 Z
+date: 2016-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: git
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
+        version: 1.3.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: fustigit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
-  type: :development
+        version: 0.1.3
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
   name: lock_manager
   requirement: !ruby/object:Gem::Requirement
@@ -73,6 +73,7 @@ files:
 - bin/inspect
 - bin/repo
 - bin/ship
+- lib/git/basic_submodules.rb
 - lib/makefile.rb
 - lib/vanagon.rb
 - lib/vanagon/common.rb
@@ -149,8 +150,22 @@ files:
 - spec/fixtures/component/test-fixture.json
 - spec/fixtures/files/fake_dir.tar.gz
 - spec/fixtures/files/fake_file.txt
+- spec/fixtures/files/fake_file_ext.7z
+- spec/fixtures/files/fake_file_ext.bz
+- spec/fixtures/files/fake_file_ext.bz2
+- spec/fixtures/files/fake_file_ext.cpio
+- spec/fixtures/files/fake_file_ext.gz
+- spec/fixtures/files/fake_file_ext.rar
+- spec/fixtures/files/fake_file_ext.tar
+- spec/fixtures/files/fake_file_ext.tar.bz2
 - spec/fixtures/files/fake_file_ext.tar.gz
+- spec/fixtures/files/fake_file_ext.tar.xz
+- spec/fixtures/files/fake_file_ext.tbz
+- spec/fixtures/files/fake_file_ext.tbz2
 - spec/fixtures/files/fake_file_ext.tgz
+- spec/fixtures/files/fake_file_ext.txz
+- spec/fixtures/files/fake_file_ext.xz
+- spec/fixtures/files/fake_file_ext.z
 - spec/fixtures/files/fake_file_ext.zip
 - spec/fixtures/wix/resources/windows/wix/file-1.wxs
 - spec/fixtures/wix/resources/windows/wix/file-2.wxs
@@ -168,7 +183,7 @@ files:
 - spec/lib/vanagon/component/rules_spec.rb
 - spec/lib/vanagon/component/source/git_spec.rb
 - spec/lib/vanagon/component/source/http_spec.rb
-- spec/lib/vanagon/component/source/localsource_spec.rb
+- spec/lib/vanagon/component/source/local_spec.rb
 - spec/lib/vanagon/component/source_spec.rb
 - spec/lib/vanagon/component_spec.rb
 - spec/lib/vanagon/driver_spec.rb
@@ -214,7 +229,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.2.5
 signing_key: 
 specification_version: 3
 summary: All of your packages will fit into this van with this one simple trick.
@@ -226,7 +241,7 @@ test_files:
 - spec/lib/vanagon/component/rules_spec.rb
 - spec/lib/vanagon/component/source/git_spec.rb
 - spec/lib/vanagon/component/source/http_spec.rb
-- spec/lib/vanagon/component/source/localsource_spec.rb
+- spec/lib/vanagon/component/source/local_spec.rb
 - spec/lib/vanagon/component/source_spec.rb
 - spec/lib/vanagon/component_spec.rb
 - spec/lib/vanagon/driver_spec.rb