autoversion 0.5.2 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd7b4f97607250bc93704a5e07b8090bd03c7781
-  data.tar.gz: 470da6b3c6d68faf3b188c60a72eac40ccf02b42
+  metadata.gz: cfa3cbc993f8e206969b4407f50f9a2d83b3b14e
+  data.tar.gz: cd5a95dc30d2eb8d314a26d804064bf48d7f09d1
 SHA512:
-  metadata.gz: e19e62c9f6f0adbe977f03b8801e4343a04cb7270934fd1e351c5114f239bb270eab91bd1ee4091d023da63ec38b53864946197101f9f7a4886d115d21a291b7
-  data.tar.gz: 58ccd1508c29127c47594120c00db96cddba4d33d2394a6ecbb85e5a121295f2a4812cf52eb0f778b9ad4005ebdbcbfd60892751d390ddd721b465e6f5af2202
+  metadata.gz: f611f283b75cc6026462bd527526610ba75219b262aff8d8c2bd5e160aebef106e5291254456cb82dceb2216e355d21e7fb21e2cc5c7febc74249aa6f30a9e85
+  data.tar.gz: 9a40fb07d455d68be5f258a86f95bb2f2bcd40cffe8f8277a0338acf02152f52aaa967fbeb216289e3d6ca9b1abeaa8679d955f4ca5171dc9c4f16f291566e9c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    autoversion (0.5.2)
+    autoversion (0.5.4)
       git (= 1.2.5)
       semantic (= 1.1.0)
       thor (= 0.17.0)

data/Versionfile

@@ -14,19 +14,3 @@ write_version do |currentVersion, nextVersion|
     file.write contents
   end
 end
-
-before :version do |currentVersion, nextVersion|
-  puts "Before version #{currentVersion} => #{nextVersion}"
-end
-
-after :version do |currentVersion|
-  puts "After version #{currentVersion}"
-end
-
-before :patch do |currentVersion, nextVersion|
-  puts "Before patch #{currentVersion} => #{nextVersion}"
-end
-
-after :patch do |currentVersion|
-  puts "After patch #{currentVersion}"
-end

data/lib/autoversion/cli.rb

@@ -51,8 +51,15 @@ module Autoversion
       def increment_version type, simulate=false, force=false
         if force or yes? "Do you want to increment #{type.to_s} to #{@versioner.next_version(type)}? (y/N)"
           outcome = simulate ? "would change" : "changed"
-          @versioner.increment! type, simulate
-          say "Version #{outcome} to #{@versioner.current_version}", simulate ? :cyan : :green
+
+          begin
+            @versioner.increment! type, simulate
+            say "Version #{outcome} to #{@versioner.current_version}", simulate ? :cyan : :green
+          rescue Autoversion::Gitter::DirtyStaging
+            say "Autoversion error: The git workspace is in a dirty state.", :red
+          rescue Autoversion::Gitter::NotOnStableBranch => e
+            say "Autoversion error: Major version increments can only happen on your configured stable branch (#{e.message}).", :red
+          end
         else
           say "No changes were made."
         end

data/lib/autoversion/gitter.rb

@@ -7,6 +7,9 @@ module Autoversion
     end
     
     class NotOnStableBranch < Exception 
+      def initialize(msg)
+        super(msg)
+      end
     end
 
     def initialize path, config
@@ -21,19 +24,17 @@ module Autoversion
       end
     end
 
-    def dir_is_clean?
-      # sum = @repo.status.untracked.length + @repo.status.added.length + @repo.status.changed.length + @repo.status.deleted.length
-      # if sum > 0
-      #   puts "untracked: #{@repo.status.untracked}"
-      #   puts "added: #{@repo.status.added}"
-      #   puts "changed: #{@repo.status.changed}"
-      #   puts "deleted: #{@repo.status.deleted}"
-      # end
+    def ensure_valid_branch! versionType
+      raise NotOnStableBranch.new(@config[:stable_branch]) if versionType == :major && !on_stable_branch?
+    end
 
-      # sum == 0
+    def dir_is_clean?
+      sum = gitstatus_untracked_workaround.length +
+            @repo.status.added.length +
+            @repo.status.changed.length +
+            @repo.status.deleted.length
 
-      # Disabled for now. ruby-git doesn't seem to read the .gitignore files, so the untracked count is completely useless. 
-      true
+      sum == 0
     end
 
     def on_stable_branch?
@@ -41,9 +42,8 @@ module Autoversion
     end
 
     def commit! versionType, currentVersion
-      return false unless @config[:actions].include?(:commit)
-      raise NotOnStableBranch if versionType == :major && !on_stable_branch?
-
+      return false unless @config[:actions].include?(:commit) 
+   
       write_commit currentVersion
       write_tag currentVersion if @config[:actions].include?(:tag)
     end
@@ -59,5 +59,12 @@ module Autoversion
       @repo.add_tag "#{@config[:prefix]}#{version}"
     end
 
+    def gitstatus_untracked_workaround
+      git_cmd = "git --work-tree=#{@repo.dir} --git-dir=#{@repo.dir}/.git " +
+                "ls-files -o -z --full-name --exclude-standard"
+      `#{git_cmd}`.split("\x0")
+    end
+
   end
-end
+end
+

data/lib/autoversion/version.rb

@@ -1,3 +1,3 @@
 module Autoversion
-  VERSION = '0.5.2'
+  VERSION = '0.5.4'
 end

data/lib/autoversion/versioner.rb

@@ -31,6 +31,8 @@ module Autoversion
 
       process_before type, @current, nextVersion
       unless simulate
+        @gitter.ensure_valid_branch! type
+
         write_version @current, nextVersion 
         @current = nextVersion
         @gitter.commit! type, @current.to_s

data/spec/gitter_spec.rb

@@ -3,63 +3,157 @@ require 'git'
 
 describe Autoversion::Gitter do
 
-  before(:each) do
-    @gitter_path = File.join(File.dirname(__FILE__), 'tmp', 'gitter')
+  before { Git.stub(:open).with(gitter_path).and_return(repo) }
 
-    if File.directory? @gitter_path
-      FileUtils.rm_rf @gitter_path
-    end
-
-    system("mkdir #{@gitter_path}")
-    system("tar -xf spec/fixtures/bare_repo.tar --strip 1 -C #{@gitter_path}")
-    
-    # Fix to make specs run on travis-ci which has no
-    # default git user config.
-    # system("cd #{@gitter_path} && git config user.email 'you@example.com'")
-    # system("cd #{@gitter_path} && git config user.name 'Your Name'")
+  let(:repo) { double() }
 
-    system("echo 'test' > #{@gitter_path}/test.txt")
-    system("cd #{@gitter_path} && git add .")
-    system("cd #{@gitter_path} && git commit -m 'test'")
+  let(:gitter_path) { File.join(File.dirname(__FILE__), 'tmp', 'gitter') }
+  let(:stable_branch) { 'master' }
 
-    @gitter_repo = Git.open(@gitter_path)
+  subject(:gitter) do
+    ::Autoversion::Gitter.new(gitter_path, {
+      :actions => [:commit],
+      :stable_branch => stable_branch})
   end
 
-  it 'should detect stable branch' do
-    @gitter = ::Autoversion::Gitter.new(@gitter_path, {
-      :stable_branch => 'master'})
+  shared_context 'when on "whatever" branch' do
+    before do
+      repo.stub(:current_branch).and_return('whatever')
+    end
+  end
 
-    @gitter_repo.branch('feature1').checkout
-    @gitter_repo.branch('feature2').checkout
-    @gitter.on_stable_branch?.should eq(false)
+  shared_context 'when on stable branch' do
+    before do
+      repo.stub(:current_branch).and_return(stable_branch)
+    end
+  end
 
-    @gitter_repo.branch('master').checkout
-    @gitter.on_stable_branch?.should eq(true)
+  describe '#ensure_cleanliness!' do
+    context 'when config actions include "commit" && #dir_is_clean? is false' do
+      before do
+        gitter.stub(:dir_is_clean?).and_return(false)        
+      end
+      it 'raises a DirtyStaging Exception' do
+        expect { gitter.ensure_cleanliness! }.to(
+          raise_error ::Autoversion::Gitter::DirtyStaging)
+      end
+    end
   end
 
-  it 'should be able to commit and tag a new version' do
-    @gitter = ::Autoversion::Gitter.new(@gitter_path, {
-      :actions => [:commit, :tag], 
-      :stable_branch => 'master'})
+  possible_dirtiness = %w[untracked changed added deleted]
+  describe '#dir_is_clean?' do
+    before do
+      # untracked workaround
+      gitter.stub(:gitstatus_untracked_workaround).and_return([])
 
-    #Fake version file
-    system("touch #{@gitter_path}/version.rb")
+      possible_dirtiness.each do |dirty|
+        repo.stub_chain(:status, :"#{dirty}").and_return({})
+      end
+    end
 
-    @gitter.commit! :major, 'v1.2.3'
+    context "when there aren't dirty files" do
+      it 'returns true' do
+        expect(gitter.dir_is_clean?).to be_true
+      end
+    end
 
-    @gitter_repo.log.first.message.should == "v1.2.3"
-    @gitter_repo.tags.first.name.should == "v1.2.3"
+    possible_dirtiness.each do |dirty|
+      context "when there are #{dirty} files" do
+        before do
+          # untracked workaround
+          if dirty == 'untracked'
+            gitter.stub(:gitstatus_untracked_workaround).and_return(
+              ["untracked_file.rb"])
+          end
+
+          # e.g.: repo.status.changed => {"changed_file.rb" => nil}
+          repo.stub_chain(:status, :"#{dirty}").and_return(
+            {"#{dirty}_file.rb" => nil})
+        end
+
+        it 'returns false' do
+          expect(gitter.dir_is_clean?).to be_false
+        end
+      end
+    end
   end
 
-  it 'should should detect cleanliness' do
-    @gitter = ::Autoversion::Gitter.new(@gitter_path, {
-      :stable_branch => 'master'})
+  describe '#on_stable_branch?' do
+    context 'when the config stable branch differs with the current branch' do
+      include_context 'when on "whatever" branch'
+
+      it 'returns false' do
+        expect(gitter.on_stable_branch?).to be_false
+      end
+    end
 
-    @gitter.dir_is_clean?.should eq(true)
-    
-    # Disabled for now since ruby-git does not read .gitignore files
-    #system("touch #{@gitter_path}/test2.txt")
-    #@gitter.dir_is_clean?.should eq(false)
+    context 'when the config stable branch equals the current branch' do
+      include_context 'when on stable branch'
+
+      it 'returns true' do
+        expect(gitter.on_stable_branch?).to be_true
+      end
+    end
   end
 
-end
+  describe '#commit!' do
+    let(:version) { 'v1.2.3' }
+    let(:invoke) { 
+      gitter.commit! :major, version 
+    }
+
+    context 'when cannot commit' do
+      context 'when config actions do not include "commit"' do
+        subject(:gitter) do
+          ::Autoversion::Gitter.new(gitter_path, {
+            :actions => [],
+            :stable_branch => stable_branch})
+        end
+
+        it 'returns false' do
+          expect(invoke).to be_false
+        end
+      end
+
+      context 'when versionType == :major && #on_stable_branch? == false' do
+        include_context 'when on "whatever" branch'
+
+        it 'raises NotOnStableBranch Exception' do
+          expect { 
+              gitter.ensure_valid_branch! :major
+              invoke 
+            }.to(
+            raise_error ::Autoversion::Gitter::NotOnStableBranch)
+        end
+      end
+    end #context cannot commit
+
+    context 'when can commit' do
+      include_context 'when on stable branch'
+
+      before do
+        repo.should_receive(:add).with('.').ordered
+        repo.should_receive(:commit).with(version).ordered
+      end
+
+      it 'calls #add and #commit on the repo (Git) object' do
+        invoke
+      end
+
+      context 'when config actions include "tag"' do
+        subject(:gitter) do
+          ::Autoversion::Gitter.new(gitter_path, {
+            :actions => [:commit, :tag],
+            :stable_branch => stable_branch})
+        end
+
+        it 'also calls #add_tag on the repo (Git) object' do
+          repo.should_receive(:add_tag).with(version).ordered
+          invoke
+        end
+      end
+    end #context can commit
+  end #commit!
+
+end
+

data/spec/spec_helper.rb

@@ -9,5 +9,6 @@ RSpec.configure do |config|
   config.after(:all) do
     FileUtils.rm_rf File.join(File.dirname(__FILE__), 'tmp', 'gitter')
     FileUtils.rm_rf File.join(File.dirname(__FILE__), 'tmp', 'cli')
+    FileUtils.rm_rf File.join(File.dirname(__FILE__), 'tmp', 'versioner')
   end
 end

data/spec/versioner_spec.rb

@@ -3,7 +3,22 @@ require 'spec_helper'
 describe Autoversion::Versioner do
 
   before(:each) do
-    @versioner = Autoversion::Versioner.new Versionfiles::VALID_BASIC
+    @path = File.join(File.dirname(__FILE__), 'tmp', 'versioner')
+    
+    if File.directory? @path
+      FileUtils.rm_rf @path
+    end
+
+    system("mkdir #{@path}")
+    system("tar -xf spec/fixtures/bare_repo.tar --strip 1 -C #{@path}")
+
+    system("echo '0.0.1' > #{@path}/version.txt")
+    system("cd #{@path} && git add .")
+    system("cd #{@path} && git commit -m 'first'")
+    
+    @repo = Git.open(@path)
+
+    @versioner = Autoversion::Versioner.new Versionfiles::VALID_BASIC, @path
   end
 
   it "should be able to read the current version" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: autoversion
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.4
 platform: ruby
 authors:
 - Jonathan Pettersson
@@ -121,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Automate your Semantic Versioning with git and hooks