taste_tester 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e725a9ee1acb9deed55ffbe08277f781058ddf3f
-  data.tar.gz: 6f2025f7cebc82628987b9c5210814f42faaf6fe
+  metadata.gz: b43e9bbdc0fa2bccc9c0bca3f4c749d6c0b4f356
+  data.tar.gz: 941177bd83e37b1830ca0f24add48768261541e9
 SHA512:
-  metadata.gz: a7230c46a3dcaefef98fe5c4cd27baba4892d2cc58551ef545c954871b73c4c61d1c808579842eb3bc11ab5f3dbd540f180012637a26b6702b4b96a83ce5ce36
-  data.tar.gz: ad0932f6ece6d46580b2781de4a01f1aa85b79fe128a86ea8729200734a6fd037d82a7abe8e2804308483864338c6daea03aec6c9e763934b68e10af3d7f864f
+  metadata.gz: 7446d6bef3d9f68860d2747a1a67141dcb3eb9fbbb9751713811afed02da87e192db4b4e473d11433fb908b4eafd14960ef610de052fbd3e8e3c82c5ccb037f2
+  data.tar.gz: db111fd123f9faff1a37b40f128e2e8a2041b27ad5be234dd62e2cf99bede17218cbbb5450543c1b999f5eed001fce18f1f8150309155e8bf250b208081d2f73

data/bin/taste-tester

@@ -123,6 +123,7 @@ MODES:
   end
 
   options = { :config_file => TasteTester::Config.config_file }
+  # rubocop:disable Metrics/BlockLength
   parser = OptionParser.new do |opts|
     opts.banner = description
 
@@ -351,6 +352,7 @@ MODES:
       options[:skip_post_test_hook] = true
     end
   end
+  # rubocop:enable Metrics/BlockLength
 
   if mode == 'help'
     puts parser

data/lib/taste_tester/config.rb

@@ -95,8 +95,14 @@ module TasteTester
     end
 
     def self.chef_port
-      range = chef_port_range.first.to_i..chef_port_range.last.to_i
-      range.to_a.shuffle.each do |port|
+      require 'taste_tester/state'
+      port_range = (
+        chef_port_range.first.to_i..chef_port_range.last.to_i
+      ).to_a.shuffle
+      if TasteTester::State.port
+        port_range.unshift(TasteTester::State.port)
+      end
+      port_range.each do |port|
         unless port_open?(port)
           return port
         end
@@ -108,9 +114,9 @@ module TasteTester
 
     def self.testing_end_time
       if TasteTester::Config.testing_until
-        TasteTester::Config.testing_until.strftime('%y%m%d%H%M.%S')
+        TasteTester::Config.testing_until
       else
-        (Time.now + TasteTester::Config.testing_time).strftime('%y%m%d%H%M.%S')
+        Time.now + TasteTester::Config.testing_time
       end
     end
   end

data/lib/taste_tester/hooks.rb

@@ -62,7 +62,7 @@ module TasteTester
         logger.error('Plugin file not found')
         exit(1)
       end
-      class_eval(File.read(path), __FILE__, __LINE__)
+      class_eval(File.read(path), path, 1)
     end
   end
 end

data/lib/taste_tester/host.rb

@@ -98,8 +98,7 @@ module TasteTester
 
       transport << 'logger -t taste-tester Moving server into taste-tester' +
         " for #{@user}"
-      transport << "touch -t #{TasteTester::Config.testing_end_time}" +
-        " #{TasteTester::Config.timestamp_file}"
+      transport << touchcmd
       transport << "echo -n '#{@serialized_config}' | base64 --decode" +
         " > #{TasteTester::Config.chef_config_path}/client-taste-tester.rb"
       transport << "rm -vf #{TasteTester::Config.chef_config_path}/" +
@@ -188,21 +187,31 @@ module TasteTester
 
     def keeptesting
       logger.warn("Renewing taste-tester on #{@name} until" +
-        " #{TasteTester::Config.testing_end_time}")
+        " #{TasteTester::Config.testing_end_time.strftime('%y%m%d%H%M.%S')}")
       if TasteTester::Config.use_ssh_tunnels
         TasteTester::Tunnel.kill(@name)
         @tunnel = TasteTester::Tunnel.new(@name, @server)
         @tunnel.run
       else
         transport = get_transport
-        transport << "touch -t #{TasteTester::Config.testing_end_time}" +
-          " #{TasteTester::Config.timestamp_file}"
+        transport << touchcmd
         transport.run!
       end
     end
 
     private
 
+    def touchcmd
+      touch = Base64.encode64(
+        "if [ 'Darwin' = $(uname) ]; then touch -t \"$(date -r " +
+        "#{TasteTester::Config.testing_end_time.to_i} +'%Y%m%d%H%M.%S')\" " +
+        "#{TasteTester::Config.timestamp_file}; else touch --date \"$(date " +
+        "-d @#{TasteTester::Config.testing_end_time.to_i} +'%Y-%m-%d %T')\" " +
+        "#{TasteTester::Config.timestamp_file}; fi",
+      ).delete("\n")
+      "echo -n '#{touch}' | base64 --decode | bash"
+    end
+
     def config
       scheme = TasteTester::Config.use_ssl ? 'https' : 'http'
       if TasteTester::Config.use_ssh_tunnels

data/lib/taste_tester/server.rb

@@ -21,6 +21,7 @@ require 'timeout'
 require 'between_meals/util'
 require 'taste_tester/config'
 require 'taste_tester/state'
+require 'taste_tester/windows'
 
 module TasteTester
   # Stateless chef-zero server management
@@ -152,19 +153,31 @@ module TasteTester
                       :logging => TasteTester::Config.chef_zero_logging,
                     })
       logger.info("Starting chef-zero of port #{@state.port}")
-      cmd = "#{chef_zero_path} --host #{@addr} --port #{@state.port} -d"
-      cmd << " --log-file #{@log_file}" +
-        ' --log-level debug' if TasteTester::Config.chef_zero_logging
-      cmd << ' --ssl' if TasteTester::Config.use_ssl
-      Mixlib::ShellOut.new(cmd).run_command.error!
+      if windows?
+        extend ::TasteTester::Windows
+        start_win_chef_zero_server
+      else
+        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
+        Mixlib::ShellOut.new(cmd).run_command.error!
+      end
     end
 
     def stop_chef_zero
-      logger.info('Killing your chef-zero instances')
-      s = Mixlib::ShellOut.new("pkill -9 -u #{ENV['USER']} -f bin/chef-zero")
-      s.run_command
-      # You have to give it a moment to stop or the stat fails
-      sleep(1)
+      if windows?
+        extend ::TasteTester::Windows
+        nuke_all_cz_pids
+      else
+        logger.info('Killing your chef-zero instances')
+        s = Mixlib::ShellOut.new("pkill -9 -u #{ENV['USER']} -f bin/chef-zero")
+        s.run_command
+        # You have to give it a moment to stop or the stat fails
+        sleep(1)
+      end
     end
 
     def chef_zero_path
@@ -172,14 +185,16 @@ module TasteTester
         return TasteTester::Config.chef_zero_path
       end
 
-      [
-        '/opt/chef/bin/chef-zero',
-        '/opt/chef/embedded/bin/chef-zero',
-      ].each do |path|
-        return path if File.exist?(path)
+      ENV['PATH'].split(':').each do |path|
+        zero = "#{path}/chef-zero"
+        return zero if File.exist?(zero)
       end
       logger.error('chef-zero not found')
       exit(1)
     end
+
+    def windows?
+      Gem.win_platform?
+    end
   end
 end

data/lib/taste_tester/state.rb

@@ -92,6 +92,14 @@ module TasteTester
     end
 
     def wipe
+      # Save port between restarts. It might not be free when we restart, but
+      # at least we'll try to keep the same
+      port = self.port
+      real_wipe
+      write(:port, port)
+    end
+
+    def real_wipe
       if TasteTester::Config.ref_file &&
          File.exists?(TasteTester::Config.ref_file)
         File.delete(TasteTester::Config.ref_file)

data/lib/taste_tester/windows.rb

@@ -0,0 +1,82 @@
+# vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2
+
+# Copyright 2013-present Facebook
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+module TasteTester
+  module Windows
+    # We use START to spawn a subprocess of chef-zero since if you were to do
+    # this directly within a terminal session it will collide with the running
+    # chef-zero process when the user tries to input commands leading to many
+    # keystrokes being lost :(
+    def start_win_chef_zero_server
+      # `START` needs quotes around one of the arguments to function correctly.
+      # rubocop:disable Lint/PercentStringArray
+      cmd = %W{
+        START "taste-tester"
+        /MIN
+        #{TasteTester::Config.chef_zero_path}
+        --port #{@state.port}
+      }.join(' ')
+      # rubocop:enable Lint/PercentStringArray
+
+      if TasteTester::Config.my_hostname
+        cmd << " --host #{TasteTester::Config.my_hostname}"
+      else
+        cmd << " --host #{@addr}"
+      end
+      if TasteTester::Config.chef_zero_logging
+        cmd << " --log-file #{@log_file} --log-level debug"
+      end
+      cmd << ' --ssl' if TasteTester::Config.use_ssl
+
+      # Mixlib::Shellout will always wait for a process to finish before
+      # returning, so we use `spawn` instead.
+      spawn(cmd)
+      sleep(2)
+    end
+
+    # `START` will also create a parent process for `cmd.exe` when `ruby.exe` is
+    # created, so we also need to make sure that we find those and kill them
+    # after the ruby process is terminated. Otherwise many orphaned `cmd.exe`
+    # windows could be left open in the aftermath.
+    def find_cz_pids
+      require 'wmi-lite'
+      wmi = WmiLite::Wmi.new
+      cz_process_query = %{
+        SELECT
+          ProcessID,
+          ParentProcessID
+        FROM
+          Win32_Process
+        WHERE
+          CommandLine LIKE "%chef-zero%"
+          AND
+          Name = "ruby.exe"
+      }
+      wmi.query(cz_process_query).map do |process|
+        [process['processid'], process['parentprocessid']]
+      end
+    end
+
+    # It is possible to have multiple chef-zero processes running which may
+    # mess up taste-tester's state. So... nuke 'em all.
+    def nuke_all_cz_pids
+      find_cz_pids.each do |pid, parentpid|
+        ::Mixlib::ShellOut.new("taskkill /F /PID #{pid}").run_command
+        ::Mixlib::ShellOut.new("taskkill /F /PID #{parentpid}").run_command
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: taste_tester
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Phil Dibowitz
@@ -9,90 +9,90 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-26 00:00:00.000000000 Z
+date: 2016-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: between_meals
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.6
 - !ruby/object:Gem::Dependency
   name: mixlib-config
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: chef-zero
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: knife-solo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Utility for testing Chef changes using chef-zero
@@ -104,21 +104,22 @@ extra_rdoc_files:
 - README.md
 - LICENSE
 files:
-- README.md
 - LICENSE
-- lib/taste_tester/logging.rb
-- lib/taste_tester/server.rb
-- lib/taste_tester/tunnel.rb
+- README.md
+- bin/taste-tester
+- lib/taste_tester/client.rb
 - lib/taste_tester/commands.rb
-- lib/taste_tester/host.rb
 - lib/taste_tester/config.rb
-- lib/taste_tester/locallink.rb
-- lib/taste_tester/client.rb
-- lib/taste_tester/hooks.rb
 - lib/taste_tester/exceptions.rb
-- lib/taste_tester/state.rb
+- lib/taste_tester/hooks.rb
+- lib/taste_tester/host.rb
+- lib/taste_tester/locallink.rb
+- lib/taste_tester/logging.rb
+- lib/taste_tester/server.rb
 - lib/taste_tester/ssh.rb
-- bin/taste-tester
+- lib/taste_tester/state.rb
+- lib/taste_tester/tunnel.rb
+- lib/taste_tester/windows.rb
 - scripts/taste-untester
 homepage: https://github.com/facebook/taste-tester
 licenses:
@@ -130,17 +131,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Taste Tester