bait 0.5.12 → 0.5.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 492066aede4bd771d097e7e7ce1b79d39fa984f5
-  data.tar.gz: f65eeda693dba6014995642e487b13916e94d2b9
+  metadata.gz: a24157c8fb0d4ac6c4a50da7cdb1ef2313e419f3
+  data.tar.gz: 2969c4f70dd268662a9e5df2e2f51576af67dbd0
 SHA512:
-  metadata.gz: 337809e4233657b7aa490f1bf7097e993d886f8fd692b1c7e826c8f335d5a94c4808a7e1461861e8f0c4165ecd95ee1a52876d9fb6bdaa34761a2735e3caa9f5
-  data.tar.gz: d6ec7ba50ca490f5f93f5fdd887915eea4bbcd3719d910bfe2c77cb4ec70f9bed7b4a64cd0e8e3e0b56c5019bc25c90a0e5b0541492ceec6913c2637e42b1651
+  metadata.gz: 373ad361ccb95aba49abbef635485b4086f5aad9e435ac6bdfe12e04d347e14570a26b96336b2460e1977d0610e895707063f68c457986786fe4ee4727db8b62
+  data.tar.gz: 7d8622aad172e9d261cee74822a727df08689c548649bc2f364d68981f996961c67d910dd4a898ae4af1ceaf11a5c3536ba4ac88e6605ce519c77b8237fa2d23

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bait (0.5.12)
+    bait (0.5.13)
       git
       haml
       moneta

data/Rakefile

@@ -35,6 +35,7 @@ end
 namespace :gem do
   task :build do
     `bundle install`
+    Rake::Task['assets:precompile'].invoke
     Rake::Task['git:dirty'].invoke
     if !git_master?
       puts "I'll only build the gem on the master branch"
@@ -45,7 +46,6 @@ namespace :gem do
         puts "Uhh.. you have failing specs -- not building the gem"
       else
         puts "Specs pass. you're ready"
-        Rake::Task['assets:precompile'].invoke
         Rake::Task['git:dirty'].invoke
         puts `gem build bait.gemspec`
         puts "Done! You can gem push that now"
@@ -53,7 +53,7 @@ namespace :gem do
     end
   end
 
-  task :push => :build do
+  task :publish => :build do
     require "bait/version"
     gem = "bait-#{Bait::VERSION}.gem"
     if File.exists?(gem)

data/VERSION

@@ -1,3 +1,3 @@
-0.5.12
+0.5.13
 
 

data/lib/bait/build.rb

@@ -16,7 +16,7 @@ module Bait
       Moneta.new(:YAML, :file => Bait.db_file('builds'))
 
     attribute :simplecov, Boolean, default: false
-    attribute :ref, String, default: "master"
+    attribute :ref, String, default: "refs/heads/master"
     attribute :owner_name, String
     attribute :owner_email, String
     attribute :name, String
@@ -36,9 +36,12 @@ module Bait
       self.cleanup!
     end
 
+    def branch
+      self.ref.gsub('refs/heads/', '')
+    end
+
     def summary
-      branch = self.ref ? self.ref.split('/').last : "n/a"
-      output = %{#{self.name} (#{branch}) #{self.status}}
+      output = %{#{self.name} (#{self.branch}) #{self.status}}
       case self.status
       when "passed"
         output.green
@@ -91,7 +94,10 @@ module Bait
         FileUtils.mkdir_p sandbox_directory
       end
       begin
-        Git.clone(clone_url, name, :path => sandbox_directory)
+        g = Git.clone(clone_url, name, :path => sandbox_directory)
+        if g.branch.name != self.branch
+          g.checkout("origin/#{self.branch}")
+        end
       rescue => ex
         msg = "Failed to clone #{clone_url}"
         self.output << "#{msg}\n\n#{ex.message}\n\n#{ex.backtrace.join("\n")}"

data/spec/lib/bait/build_spec.rb

@@ -82,9 +82,17 @@ describe Bait::Build do
 
   describe "#clone!" do
     context 'valid clone url' do
-      before { build.clone_url = repo_path ; build.clone! }
+      before do
+        build.clone_url = repo_path
+        build.clone!
+      end
       specify { build.output.should_not match /Failed to clone/ }
       specify { build.should be_cloned }
+      it "should be on the correct branch" do
+        g = Git.open File.join(build.sandbox_directory, build.name)
+        g.branch.name.should eq build.branch
+        build.ref.should include build.branch
+      end
     end
     context "invalid clone url" do
       before { build.clone_url = "invalid" ; build.clone! }
@@ -156,4 +164,11 @@ describe Bait::Build do
       build.summary.should match /.+ \(.+\) .+/
     end
   end
+
+  describe "#branch" do
+    it "removes the refs/heads portion and returns only the branch name" do
+      build.ref = "refs/heads/foo/bar/baz"
+      build.branch.should eq "foo/bar/baz"
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bait
 version: !ruby/object:Gem::Version
-  version: 0.5.12
+  version: 0.5.13
 platform: ruby
 authors:
 - Keyvan Fatehi
@@ -329,7 +329,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.5
 signing_key: 
 specification_version: 4
 summary: build and integration test service