git-autobisect 0.2.0 → 0.2.1

data/Gemfile

@@ -1,5 +1,6 @@
 source :rubygems
 gemspec
 
+gem 'bump'
 gem 'rake'
 gem 'rspec', '~>2'

data/Gemfile.lock

@@ -1,11 +1,12 @@
 PATH
   remote: .
   specs:
-    git-autobisect (0.2.0)
+    git-autobisect (0.2.1)
 
 GEM
   remote: http://rubygems.org/
   specs:
+    bump (0.3.5)
     diff-lcs (1.1.3)
     rake (0.9.2.2)
     rspec (2.11.0)
@@ -21,6 +22,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  bump
   git-autobisect!
   rake
   rspec (~> 2)

data/Rakefile

@@ -1,22 +1,6 @@
 require 'bundler/gem_tasks'
+require 'bump/tasks'
 
 task :default do
   sh "rspec spec/"
 end
-
-# extracted from https://github.com/grosser/project_template
-rule /^version:bump:.*/ do |t|
-  sh "git status | grep 'nothing to commit'" # ensure we are not dirty
-  index = ['major', 'minor','patch'].index(t.name.split(':').last)
-  file = 'lib/git/autobisect/version.rb'
-
-  version_file = File.read(file)
-  old_version, *version_parts = version_file.match(/(\d+)\.(\d+)\.(\d+)/).to_a
-  version_parts[index] = version_parts[index].to_i + 1
-  version_parts[2] = 0 if index < 2 # remove patch for minor
-  version_parts[1] = 0 if index < 1 # remove minor for major
-  new_version = version_parts * '.'
-  File.open(file,'w'){|f| f.write(version_file.sub(old_version, new_version)) }
-
-  sh "bundle && git add #{file} Gemfile.lock && git commit -m 'bump version to #{new_version}'"
-end

data/Readme.md

@@ -21,7 +21,12 @@ Usage
 
 ### Options
 
-    -m, --max [N]                    Inspect commits between HEAD..HEAD~<max>
+    -m, --max N                    Inspect commits between HEAD..HEAD~<max>
+    -s, --start N                  Use N (instead of 1) as initial step and keep muliplying by 2
+
+TIPS
+====
+ - do not fail if test file is missing `[ ! -f spec/my_spec.rb ] || rspec spec/my_spec.rb`
 
 TODO
 ====

data/lib/git/autobisect.rb

@@ -19,7 +19,7 @@ module Git
 
       def run_command(command, options)
         commits = `git log --pretty=format:'%h' | head -n #{options[:max]}`.split("\n")
-        good, bad = find_good_and_bad_commit(commits, command)
+        good, bad = find_good_and_bad_commit(commits, command, options)
 
         if good == commits.first
           puts " ---> HEAD is not broken"
@@ -57,7 +57,8 @@ module Git
           BANNER
           opts.on("-h", "--help", "Show this.") { puts opts; exit }
           opts.on("-v", "--version", "Show Version"){ puts "git-autobisect #{Version}"; exit }
-          opts.on("-m", "--max [N]", Integer, "Inspect commits between HEAD..HEAD~<max>"){|max| options[:max] = max }
+          opts.on("-m", "--max N", Integer, "Inspect commits between HEAD..HEAD~<max>"){|max| options[:max] = max }
+          opts.on("-s", "--start N", Integer, "Use N (instead of 1) as initial step and keep muliplying by 2"){|start| options[:start] = start }
         end.parse!(argv)
         options
       end
@@ -78,21 +79,22 @@ module Git
         raise "Command failed #{command}" unless run(command).first
       end
 
-      def find_good_and_bad_commit(commits, command)
-        i = 0
+      def find_good_and_bad_commit(commits, command, options)
+        initial = 1
+        i = options[:start] || initial
         maybe_good = commits.first
 
         loop do
           # scan backwards through commits to find a good
-          offset = [2**i - 1, commits.size-1].min
+          offset = [i - 1, commits.size-1].min
           maybe_good, bad = commits[offset], maybe_good
-          return if i > 0 and bad == maybe_good # we reached the end
+          return if i > initial and bad == maybe_good # we reached the end
 
           # see if it works
           puts " ---> Now trying #{maybe_good} (HEAD~#{offset})"
           run!("git checkout #{maybe_good}")
           return [maybe_good, bad] if run(command).first
-          i += 1
+          i *= 2
         end
       end
 

data/lib/git/autobisect/version.rb

@@ -1,5 +1,5 @@
 module Git
   module Autobisect
-    VERSION = Version = "0.2.0"
+    VERSION = Version = "0.2.1"
   end
 end

data/spec/git-autobisect_spec.rb

@@ -81,6 +81,17 @@ describe "git-autobisect" do
       end
     end
 
+    context "--start" do
+      let(:command){ "'test -e a' --start 5" }
+
+      it "starts at given point" do
+        remove_a
+        30.times{ add_irrelevant_commit }
+        result = autobisect(command)
+        result.scan(/HEAD~\d+/).should == ["HEAD~4", "HEAD~9", "HEAD~19", "HEAD~31"]
+      end
+    end
+
     it "finds the first broken commit for 1 commit" do
       remove_a
       result = autobisect("'test -e a'")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-autobisect
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-06 00:00:00.000000000 Z
+date: 2012-11-02 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: michael@grosser.it
@@ -43,7 +43,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1063815506089341293
+      hash: 1643035677456387071
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -52,7 +52,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1063815506089341293
+      hash: 1643035677456387071
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24