taste_tester 0.0.5 → 0.0.6

data/bin/taste-tester

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+$LOAD_PATH.unshift(File.dirname(File.realpath(__FILE__)) + '/../lib')
+
 # rubocop:disable UnusedBlockArgument, AlignParameters
 if ENV['MY_RUBY_HOME'] && ENV['MY_RUBY_HOME'].include?('rvm')
   puts 'Please disable RVM before running taste-tester'

data/lib/taste_tester/client.rb

@@ -42,9 +42,14 @@ module TasteTester
         :checksum_dir => TasteTester::Config.checksum_dir,
       )
       @knife.write_user_config
-      @repo = BetweenMeals::Repo.get(TasteTester::Config.repo_type,
-                                     TasteTester::Config.repo, logger)
-      fail 'Could not read repo' unless @repo
+      @repo = BetweenMeals::Repo.get(
+        TasteTester::Config.repo_type,
+        TasteTester::Config.repo,
+        logger,
+      )
+      unless @repo.exists?
+        fail "Could not open repo from #{TasteTester::Config.repo}"
+      end
     end
 
     def checks

data/lib/taste_tester/commands.rb

@@ -34,8 +34,7 @@ module TasteTester
 
     def self.restart
       server = TasteTester::Server.new
-      server.stop if TasteTester::Server.running?
-      server.start
+      server.restart
     end
 
     def self.stop
@@ -78,8 +77,14 @@ module TasteTester
         upload
       end
       server = TasteTester::Server.new
-      repo = BetweenMeals::Repo.get(TasteTester::Config.repo_type,
-                                    TasteTester::Config.repo, logger)
+      repo = BetweenMeals::Repo.get(
+        TasteTester::Config.repo_type,
+        TasteTester::Config.repo,
+        logger,
+      )
+      unless repo.exists?
+        fail "Could not open repo from #{TasteTester::Config.repo}"
+      end
       unless TasteTester::Config.skip_pre_test_hook
         TasteTester::Hooks.pre_test(TasteTester::Config.dryrun, repo, hosts)
       end
@@ -153,6 +158,18 @@ module TasteTester
       client.skip_checks = true if TasteTester::Config.skip_checks
       client.force = true if TasteTester::Config.force_upload
       client.upload
+    rescue => exception
+      errors = ['Cannot find a cookbook named', 'Connection reset by peer']
+      if errors.any? { |e| exception.to_s.match(/#{e}/im) }
+        TasteTester::Config.force_upload = true
+        unless @already_retried
+          @already_retried = true
+          retry
+        end
+      end
+      logger.error("Upload failed")
+      logger.error(e.to_s)
+      exit 1
     end
   end
 end

data/lib/taste_tester/server.rb

@@ -66,14 +66,15 @@ module TasteTester
 
     def start
       return if TasteTester::Server.running?
-      @state.wipe
       logger.warn('Starting taste-tester server')
+      @state.wipe
       write_config
       start_chef_zero
     end
 
     def stop
       logger.warn('Stopping taste-tester server')
+      @state.wipe
       stop_chef_zero
     end
 
@@ -125,8 +126,9 @@ module TasteTester
     end
 
     def start_chef_zero
-      @state.wipe
-      @state.port = TasteTester::Config.chef_port
+      unless @state.port
+        @state.port = TasteTester::Config.chef_port
+      end
       logger.info("Starting chef-zero of port #{@state.port}")
       Mixlib::ShellOut.new(
         "/opt/chef/embedded/bin/chef-zero --host #{@addr}" +
@@ -135,7 +137,6 @@ module TasteTester
     end
 
     def stop_chef_zero
-      @state.wipe
       logger.info('Killing your chef-zero instances')
       s = Mixlib::ShellOut.new("pkill -9 -u #{ENV['USER']} -f bin/chef-zero")
       s.run_command

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: taste_tester
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-23 00:00:00.000000000 Z
+date: 2014-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-config
@@ -71,16 +71,16 @@ extra_rdoc_files:
 files:
 - README.md
 - LICENSE
-- lib/taste_tester/host.rb
-- lib/taste_tester/ssh.rb
-- lib/taste_tester/tunnel.rb
-- lib/taste_tester/server.rb
-- lib/taste_tester/client.rb
 - lib/taste_tester/hooks.rb
-- lib/taste_tester/config.rb
 - lib/taste_tester/logging.rb
-- lib/taste_tester/state.rb
 - lib/taste_tester/commands.rb
+- lib/taste_tester/tunnel.rb
+- lib/taste_tester/host.rb
+- lib/taste_tester/state.rb
+- lib/taste_tester/client.rb
+- lib/taste_tester/config.rb
+- lib/taste_tester/server.rb
+- lib/taste_tester/ssh.rb
 - bin/taste-tester
 - scripts/taste-untester
 homepage: https://github.com/facebook/taste-tester