vendorificator 0.5.1 → 0.5.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTE1OGVlNWQzNzgzOWExZWYzMDIzOWVkMDI4MDJhYWVjN2JjM2Y1NQ==
+    MzgxYzI5ZDQxNjE5M2Q2NDhmYWQ1OTY4N2EwYjg0YzFmOTU2MzcxMA==
   data.tar.gz: !binary |-
-    MjJkYjE2OTM1MjYwMGZlNzI0MGNkMzRhMWRiYmY5ZDRmYWQyNDAyOA==
+    NzhjZWY3NDg0NWUyY2M2NGFhMDk3YWY5ODMzNmI3YjM0MDQ3ZWMwOQ==
 SHA512:
   metadata.gz: !binary |-
-    YWY2OTYwYTdmYTRjMGVlNmZlNmVlNDYyZWE2YTg3M2Q0NDM3NTE2MjdmNzY5
-    N2Y2MDM2ZDhkYTUyNmVmNzlmNDk2NGYxZTA1YzZlOWE5MzQ3NGMxZjFlYjhk
-    ZmE2Njc0YmIxYjE4ZGJiZjk4YTU5ZGM4NDg4OTAzMmJlYThlM2Y=
+    N2I2MzRkZDk5MjM0ZWYwYmU4YjNkNjIxZWRkNzdmNGU5M2E4NTk0ZWE3MDMx
+    N2NkZDk1MjI5ODhkZTY3M2NmODQ1OTI4YWI3OTQ1MDEzN2Q1MjUzYTYwNDVh
+    MDA0ZGY1MTJkMzVkOWQyZWRiYTMxNjJhN2YyOTBiMGM1MTFmNDg=
   data.tar.gz: !binary |-
-    ZTYzZThiNWZmYzE3MTI1OGFlNTRkOTM0ODhjYzk4Nzc0YTMwODcwYTczYWJm
-    ODY3OTQ2MGQyZTY0N2YxMGQ2M2JjNDI3MTI5ODFlMjE1NDkzYjBlYmY1Y2Ey
-    YTFjN2FhNmViODYwZmVhYTJhZjFkNGUwOGIyZmZkNmE3YjliYjE=
+    ODZmYzQzMzY4ZTdhZDgzY2RlY2NmMmUyMjNhODkzNjcwOGE1MjBkYTMzZDA4
+    YjNjM2U4ZTJlYjZmZWZkMjY1OTU2MTZlY2IwZWVmODQ3ZDA2OWQ1M2I1ODQ1
+    NjMyNjM5MDg1YWVjOGFlMDBmZWRhYzVlM2U4ZGExZDk5NjZhNGE=

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changes
 
+## 0.5.2
+
+ - Fixed `vendor push`
+ - Added `--pull` and `--push` switches to `vendor update`
+
 ## 0.5.1
 
  - Correctly specify ref for specs/extras in tool.

data/lib/vendorificator/cli.rb

@@ -75,8 +75,12 @@ module Vendorificator
     end
 
     desc :update, "Update installed vendor files"
+    method_option :pull, :type => :boolean, :default => false
+    method_option :push, :type => :boolean, :default => false
     def update(*modules)
+      pull if options[:pull]
       environment.sync options.merge(:segments => modules, :update => true)
+      push if options[:push]
     rescue DirtyRepoError
       fail! 'Repository is not clean.'
     end

data/lib/vendorificator/segment.rb

@@ -95,6 +95,13 @@ module Vendorificator
       merged_tag && merged_tag[(1 + tag_name_base.length)..-1]
     end
 
+
+    def head
+      git.capturing.rev_parse({:verify => true, :quiet => true}, "refs/heads/#{branch_name}").strip
+    rescue MiniGit::GitError
+      nil
+    end
+
     private
 
     def config
@@ -129,12 +136,6 @@ module Vendorificator
         to_yaml
     end
 
-    def head
-      git.capturing.rev_parse({:verify => true, :quiet => true}, "refs/heads/#{branch_name}").strip
-    rescue MiniGit::GitError
-      nil
-    end
-
     def in_branch(branch = branch_name, options = {}, &block)
       Dir.mktmpdir do |tmpdir|
         tmpgit = create_temp_git_repo(branch, options, tmpdir)

data/lib/vendorificator/version.rb

@@ -1,3 +1,3 @@
 module Vendorificator
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

data/spec/vendorificator/environment_spec.rb

@@ -2,12 +2,7 @@ require 'spec_helper'
 
 module Vendorificator
   describe Environment do
-    let(:environment) do
-      Environment.new Thor::Shell::Basic.new, :quiet, nil do
-        vendor 'name', :option => 'value'
-        vendor 'other_name', :option => 'other_value'
-      end
-    end
+    let(:environment) { Environment.new(Thor::Shell::Basic.new, :quiet, nil){} }
 
     before do
       environment.git.capturing.stubs(:remote).returns("origin\n")
@@ -47,8 +42,6 @@ module Vendorificator
     end
 
     describe '#pull' do
-      let(:environment){ Environment.new(Thor::Shell::Basic.new, :quiet, nil){} }
-
       before do
         environment.git.expects(:fetch).with('origin')
         environment.git.expects(:fetch).with({:tags => true}, 'origin')
@@ -85,8 +78,6 @@ module Vendorificator
     end
 
     describe '#push' do
-      let(:environment){ Environment.new(Thor::Shell::Basic.new, :quiet, nil){} }
-
       it "handles git error on pushing empty notes" do
         environment.stubs(:ensure_clean!)
 
@@ -109,8 +100,6 @@ module Vendorificator
     end
 
     describe '#segments' do
-      let(:environment){ Environment.new Thor::Shell::Basic.new, :default, nil }
-
       it 'is initialized on a new environment' do
         assert { environment.segments == [] }
       end

data/spec/vendorificator/segment_spec.rb

@@ -15,6 +15,22 @@ module Vendorificator
       end
     end
 
+    describe '#head' do
+      let(:seg) { Vendor.new(basic_environment, 'test').segment }
+      let(:rev_parse) { basic_environment.git.capturing.expects(:rev_parse).with({:verify => true, :quiet => true}, "refs/heads/vendor/test") }
+      it "returns SHA1 of segment's head" do
+        rev_parse.returns "a2745fdf2d7e51f139f9417c5ca045b389fa939f\n"
+        head = seg.head
+        assert { head == 'a2745fdf2d7e51f139f9417c5ca045b389fa939f' }
+      end
+
+      it "returns nil when segment's branch does not exist" do
+        rev_parse.raises MiniGit::GitError
+        head = seg.head
+        assert { head.nil? }
+      end
+    end
+
     describe '#branch_name' do
       it 'includes vendor group' do
         uncategorized = Vendor.new(basic_environment, 'test').segment

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vendorificator
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Maciej Pasternacki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-19 00:00:00.000000000 Z
+date: 2014-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: escape