git_test 0.0.8 → 0.0.9

data/README.md

@@ -3,7 +3,7 @@
 Your test results...distributed
 
 git\_test runs your tests and stores them in git. Use git_test to track
-tests over multiple branches, runs, and teammates. Run git\_test when you pull and push
+tests over multiple branches, runs, and teammates. Run git\_test when you fetch and push
 and you'll always know the state of your project!
 
 ## Install
@@ -16,9 +16,9 @@ Before you push your code to a central repo run your tests
 
     $ git_test push
 
-After you pull new code down run your tests
+After you fetch new code down run your tests
 
-    $ git_test pull
+    $ git_test fetch
 
 Whenever you feel like it, run your tests
 
@@ -66,7 +66,7 @@ Git test works by making a temp directory, cloning your repository into that dir
 
 ## CI Isn't Enough
 
-On most projects everyone should run tests locally. The goal of git_test is to make running local tests as easy as possible and also to make them more useful. We do that by storing the result so you can compare branches and find out if another team-members pull request is ATP without having to ask.
+On most projects everyone should run tests locally. The goal of git_test is to make running local tests as easy as possible and also to make them more useful. We do that by storing the result so you can compare branches and find out if another team-members fetch request is ATP without having to ask.
 
 Even better have your CI save its results in git_test.
 

data/bin/git_test

@@ -26,7 +26,7 @@ include GLI
 
 
 program_desc %Q{ git_test runs your tests and stores them in git. Use git_test to track
-  tests over multiple branches, runs, and teammates. Run git_test when you pull and push
+  tests over multiple branches, runs, and teammates. Run git_test when you fetch and push
   and you'll always know the state of your project!}
 
 version GitTest::VERSION
@@ -59,13 +59,13 @@ end
 
 
 
-desc "pulls from origin then runs tests"
-command :pull do |c|
+desc "fetchs from origin then runs tests"
+command :fetch do |c|
   c.action do |global_options,options,args|
     begin
       global_options.merge! options
       runner = GitTest::Runner.new(global_options)
-      runner.pull!
+      runner.fetch!
       runner.test!
       runner.write_report!
       runner.notify.write("to view test report run `git_test show last`", :green)
@@ -101,7 +101,7 @@ command :push do |c|
     begin
       global_options.merge! options
       runner = GitTest::Runner.new(global_options)
-      runner.pull!
+      runner.fetch!
       runner.push! unless options[:push_after_test]
       runner.test!
       runner.write_report!

data/lib/git_test/runner.rb

@@ -3,44 +3,50 @@ require 'time'
 module GitTest
   # orchestrates everything
   class Runner
-     attr_accessor :notify, :options, :proj, :test_proj, :test, :writer, :test_dir
+     attr_accessor :notify, :options, :proj, :test_proj, :test, :writer, :test_dir, :proj_branch
 
      def initialize(options ={} , notify = Notify.new)
-       self.options  = options
-       self.notify   = notify
-       self.proj     = GitTest::Proj.new(options)
-       self.test     = GitTest::Test.new(options)
-       self.test_dir = Dir.mktmpdir(".git_test_#{proj.current_branch}_#{Time.now.to_i}")
+       self.options     = options
+       self.notify      = notify
+       self.proj        = GitTest::Proj.new(options)
+       self.test        = GitTest::Test.new(options)
+       self.proj_branch = proj.current_branch
+       self.test_dir    = Dir.mktmpdir(".git_test_#{proj_branch}_#{Time.now.to_i}")
+       prepare_proj_for_test!
        clone_to_test!
      end
 
+     def prepare_proj_for_test!
+       proj.check_repo_status!
+       proj.branch(report_branch) unless proj.is_branch? report_branch
+     end
+
      # runs the test command provided
      def test!
        in_test_dir do
-         proj.check_repo_status!
-         notify.start("Running tests on: #{proj.current_branch}")
+         notify.start("Running tests on: #{proj_branch}")
          test.run!
          notify.done("Test finished: #{test.status}", test.passed?)
        end
      end
 
      # will open the specified or  last report
-     def show_report(file_name = nil, branch = current_branch)
+     def show_report(file_name = nil, branch = proj_branch)
        file_name ||= last_report_file_name(branch)
        report = proj.show(report_branch, File.join(report_path(branch), file_name))
        report_file = Tempfile.new([report_name, report_extension])
        report_file.write(report)
-       exec "open #{report_file.path}"
-       sleep 300
+       `open #{report_file.path}`
+       sleep 3
      end
 
      # gives last report file name
-     def last_report_file_name(branch = current_branch)
+     def last_report_file_name(branch = proj_branch)
        ls_report_dir(branch).first
      end
 
      # outputs the files in the test directory for a given branch
-     def ls_report_dir(branch = current_branch)
+     def ls_report_dir(branch = proj_branch)
        files = proj.show(report_branch, report_path(branch)).split("\n")
        files.shift(2)
        files
@@ -55,14 +61,14 @@ module GitTest
      # pushes to origin on the current branch and report branch
      def push!
        notify.write("Pushing to origin")
-       proj.push('origin', proj.current_branch)
-       proj.push('origin', report_branch) if proj.is_branch? report_branch
+       proj.push('origin', proj_branch)
+       proj.push('origin', report_branch)
      end
 
      # pulls from origin on the current branch and report branch
-     def pull!
+     def fetch!
        notify.write("Pulling from origin")
-       proj.pull('origin', proj.current_branch)
+       proj.fetch(proj_branch)
      end
 
      # writes the result of the test command to disk
@@ -81,10 +87,10 @@ module GitTest
 
      # commits contents of test branch and pushes back to local repo
      def commit_to_test_proj!
-       test_proj.add full_report_path
-       result = test_proj.commit("#{proj.current_branch} #{report_name}")
+       test_proj.add(full_report_path)
+       result = test_proj.commit("#{proj_branch} #{report_name}")
        notify.write("Pushing back to local repo")
-       test_proj.real_pull('origin', report_branch) if proj.is_branch? report_branch
+       test_proj.real_pull('origin', report_branch)
        test_proj.push('origin', report_branch)
      end
 
@@ -98,20 +104,16 @@ module GitTest
        "git_test_reports"
      end
 
-     def report_path(branch = proj.current_branch)
+     def report_path(branch = proj_branch)
        "git_test_reports/#{branch}"
      end
 
      def report_name
        name =  "#{ test.created_at.utc.iso8601 }_"
-       name << "#{ proj.username }_"
+       name << "#{ test_proj.username }_"
        name << "#{ test.status }#{ report_extension }"
      end
 
-     def current_branch
-       proj.current_branch
-     end
-
 
 
      def report_extension
@@ -136,7 +138,6 @@ module GitTest
          branch.checkout
          test_proj.checkout(branch)
          yield
-         test_proj.checkout(proj.current_branch)
        end
      end
    end

data/lib/git_test_version.rb

@@ -1,3 +1,3 @@
 module GitTest
-  VERSION = '0.0.8'
+  VERSION = '0.0.9'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: git_test
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 0
-  - 8
-  version: 0.0.8
+  - 9
+  version: 0.0.9
 platform: ruby
 authors: 
 - Richard Schneeman
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-27 00:00:00 Z
+date: 2011-10-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake