taste_tester 0.0.13 → 0.0.14

data/lib/taste_tester/noop.rb

@@ -22,7 +22,7 @@ module TasteTester
     include TasteTester::Logging
     include BetweenMeals::Util
 
-    attr_reader :output
+    attr_reader :output, :status
 
     def initialize
       print_noop_warning
@@ -48,7 +48,7 @@ module TasteTester
     alias << add
 
     def run
-      run!
+      @status, @output = run!
     end
 
     def run!
@@ -56,6 +56,10 @@ module TasteTester
       [0, "# TasteTester by #{@user}"]
     end
 
+    def error!
+      # never fails, but interface requires a definition
+    end
+
     private
 
     def cmd

data/lib/taste_tester/server.rb

@@ -30,13 +30,14 @@ module TasteTester
     include TasteTester::Logging
     extend ::BetweenMeals::Util
 
-    attr_accessor :user, :host
+    attr_accessor :user, :host, :bundle_dir
 
     def initialize
       @state = TasteTester::State.new
       @ref_file = TasteTester::Config.ref_file
       ref_dir = File.dirname(File.expand_path(@ref_file))
-      @log_file = "#{ref_dir}/chef-zero.log"
+      @log_file = File.join(ref_dir, 'chef-zero.log')
+      @fsroot = File.join(ref_dir, 'root')
       @zero_path = TasteTester::Config.chef_zero_path
       unless File.directory?(ref_dir)
         begin
@@ -46,6 +47,10 @@ module TasteTester
           logger.warn(e)
         end
       end
+      if TasteTester::Config.bundle
+        @bundle_dir = File.join(@fsroot, 'organizations/chef/file_store')
+        FileUtils.mkpath(@bundle_dir)
+      end
 
       @user = ENV['USER']
 
@@ -53,7 +58,8 @@ module TasteTester
       # determines if we listen only on localhost or not
       @need_restart = @state.ssl != TasteTester::Config.use_ssl ||
                       @state.logging != TasteTester::Config.chef_zero_logging ||
-                      @state.ssh != TasteTester::Config.use_ssh_tunnels
+                      @state.ssh != TasteTester::Config.use_ssh_tunnels ||
+                      @state.bundle != TasteTester::Config.bundle
 
       # If we are using SSH tunneling listen on localhost, otherwise listen
       # on all addresses - both v4 and v6. Note that on localhost, ::1 is
@@ -121,10 +127,20 @@ module TasteTester
       @state.ref = ref
     end
 
+    def last_upload_time
+      @state.last_upload_time
+    end
+
+    def last_upload_time=(time)
+      @state.last_upload_time = time
+    end
+
     def self.running?
       if TasteTester::State.port
-        return port_open?(TasteTester::State.port)
+        return chef_zero_running?(TasteTester::State.port,
+                                  TasteTester::Config.use_ssl)
       end
+
       false
     end
 
@@ -152,18 +168,20 @@ module TasteTester
                       :ssl => TasteTester::Config.use_ssl,
                       :ssh => TasteTester::Config.use_ssh_tunnels,
                       :logging => TasteTester::Config.chef_zero_logging,
+                      :bundle => TasteTester::Config.bundle,
                     })
       logger.info("Starting chef-zero of port #{@state.port}")
       if windows?
         extend ::TasteTester::Windows
         start_win_chef_zero_server
       else
-        cmd = "#{chef_zero_path} --host #{@addr} --port #{@state.port} -d"
+        cmd = +"#{chef_zero_path} --host #{@addr} --port #{@state.port} -d"
         if TasteTester::Config.chef_zero_logging
           cmd << " --log-file #{@log_file}" +
             ' --log-level debug'
         end
         cmd << ' --ssl' if TasteTester::Config.use_ssl
+        cmd << " --file-store #{@fsroot}" if TasteTester::Config.bundle
         Mixlib::ShellOut.new(cmd).run_command.error!
       end
     end

data/lib/taste_tester/ssh.rb

@@ -22,11 +22,10 @@ module TasteTester
     include TasteTester::Logging
     include BetweenMeals::Util
 
-    attr_reader :output
+    attr_reader :output, :status
 
-    def initialize(host, timeout = 5, tunnel = false)
+    def initialize(host, tunnel = false)
       @host = host
-      @timeout = timeout
       @tunnel = tunnel
       @cmds = []
     end
@@ -44,18 +43,20 @@ module TasteTester
     def run!
       @status, @output = exec!(cmd, logger)
     rescue StandardError => e
-      # rubocop:disable LineLength
-      error = <<-MSG
+      logger.error(e.message)
+      error!
+    end
+
+    def error!
+      error = <<-ERRORMESSAGE
 SSH returned error while connecting to #{TasteTester::Config.user}@#{@host}
 The host might be broken or your SSH access is not working properly
 Try doing
   #{TasteTester::Config.ssh_command} -v #{TasteTester::Config.user}@#{@host}
 and come back once that works
-MSG
-      # rubocop:enable LineLength
+      ERRORMESSAGE
       error.lines.each { |x| logger.error x.strip }
-      logger.error(e.message)
-      raise TasteTester::Exceptions::SshError
+      fail TasteTester::Exceptions::SshError
     end
 
     private
@@ -66,7 +67,8 @@ MSG
       end
       cmds = @cmds.join(' && ')
       cmd = "#{TasteTester::Config.ssh_command} " +
-            "-T -o BatchMode=yes -o ConnectTimeout=#{@timeout} " +
+            '-T -o BatchMode=yes ' +
+            "-o ConnectTimeout=#{TasteTester::Config.ssh_connect_timeout} " +
             "#{TasteTester::Config.user}@#{@host} "
       if TasteTester::Config.user != 'root'
         cc = Base64.encode64(cmds).delete("\n")

data/lib/taste_tester/state.rb

@@ -17,6 +17,7 @@
 require 'fileutils'
 require 'socket'
 require 'timeout'
+require 'chef/mash'
 
 require 'between_meals/util'
 require 'taste_tester/config'
@@ -29,9 +30,7 @@ module TasteTester
     include ::BetweenMeals::Util
 
     def initialize
-      ref_dir = File.dirname(
-        File.expand_path(TasteTester::Config.ref_file),
-      )
+      ref_dir = File.dirname(File.expand_path(TasteTester::Config.ref_file))
       unless File.directory?(ref_dir)
         begin
           FileUtils.mkpath(ref_dir)
@@ -83,6 +82,22 @@ module TasteTester
       write(:ref, ref)
     end
 
+    def last_upload_time
+      TasteTester::State.read(:last_upload_time)
+    end
+
+    def last_upload_time=(time)
+      write(:last_upload_time, time)
+    end
+
+    def bundle
+      TasteTester::State.read(:bundle)
+    end
+
+    def bundle=(bundle)
+      write(:bundle, bundle)
+    end
+
     def update(vals)
       merge(vals)
     end
@@ -120,6 +135,10 @@ module TasteTester
     end
 
     def merge(vals)
+      # we generally use symbols for the keys, but to/from JSON will
+      # give us strings, and thus duplicate keys, which is bad. So
+      # use a Mash
+      state = Mash.new
       begin
         state = JSON.parse(File.read(TasteTester::Config.ref_file))
       rescue StandardError

data/lib/taste_tester/tunnel.rb

@@ -22,10 +22,9 @@ module TasteTester
 
     attr_reader :port
 
-    def initialize(host, server, timeout = 5)
+    def initialize(host, server)
       @host = host
       @server = server
-      @timeout = timeout
       if TasteTester::Config.testing_until
         @delta_secs = TasteTester::Config.testing_until.strftime('%s').to_i -
                       Time.now.strftime('%s').to_i
@@ -38,8 +37,8 @@ module TasteTester
       @port = TasteTester::Config.tunnel_port
       logger.info("Setting up tunnel on port #{@port}")
       @status, @output = exec!(cmd, logger)
-    rescue StandardError
-      logger.error 'Failed bringing up ssh tunnel'
+    rescue StandardError => e
+      logger.error "Failed bringing up ssh tunnel: #{e}"
       exit(1)
     end
 
@@ -58,7 +57,8 @@ module TasteTester
       # in a way that port was still open, but subsequent requests were hanging.
       # This is reproducible and should be looked into.
       cmd = "#{TasteTester::Config.ssh_command} " +
-            "-T -o BatchMode=yes -o ConnectTimeout=#{@timeout} " +
+            "-o ConnectTimeout=#{TasteTester::Config.ssh_connect_timeout} " +
+            '-T -o BatchMode=yes ' +
             '-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no ' +
             "-o ServerAliveInterval=10 -o ServerAliveCountMax=#{@max_ping} " +
             "-f -R #{@port}:localhost:#{@server.port} "

data/lib/taste_tester/windows.rb

@@ -40,6 +40,7 @@ module TasteTester
         cmd << " --log-file #{@log_file} --log-level debug"
       end
       cmd << ' --ssl' if TasteTester::Config.use_ssl
+      cmd << " --file-store #{@fsroot}" if TasteTester::Config.bundle
 
       # Mixlib::Shellout will always wait for a process to finish before
       # returning, so we use `spawn` instead.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: taste_tester
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - Phil Dibowitz
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-18 00:00:00.000000000 Z
+date: 2019-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: between_meals
@@ -26,21 +26,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.0.6
 - !ruby/object:Gem::Dependency
-  name: mixlib-config
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
-  name: colorize
+  name: mixlib-config
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -54,13 +54,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -95,6 +95,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.6.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.6.1
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.49.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.49.1
 description: Utility for testing Chef changes using chef-zero
 email: 
 executables:
@@ -142,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Taste Tester