opscode-pushy-client 2.3.0 → 2.4.11

data/omnibus/config/projects/push-jobs-client.rb

@@ -26,8 +26,12 @@ license_file "LICENSE"
 replace  "opscode-push-jobs-client"
 conflict "opscode-push-jobs-client"
 
-build_iteration 1
-build_version "2.2.0"
+build_version IO.read(File.expand_path("../../../../VERSION", __FILE__)).strip
+
+# In order to prevent unecessary cache expiration, version overrides
+# and build_iteration are kept in <project-root>/omnibus_overrides.rb
+overrides_path = File.expand_path("../../../../omnibus_overrides.rb", __FILE__)
+instance_eval(IO.read(overrides_path), overrides_path)
 
 if windows?
   # NOTE: Ruby DevKit fundamentally CANNOT be installed into "Program Files"
@@ -38,19 +42,6 @@ else
   install_dir "#{default_root}/#{name}"
 end
 
-# TODO: Support chef/ohai master (13)
-override :chef,           version: "v12.19.36" # pin to latest pre-13
-override :ohai,           version: "v8.23.0" # pin to latest pre-13
-
-override :bundler,        version: "1.12.5"
-override :rubygems,       version: "2.6.10"
-override :ruby,           version: "2.3.3"
-
-# Share pins with ChefDK
-override :libzmq,         version: "4.0.5"
-
-######
-
 dependency "preparation"
 dependency "rb-readline"
 dependency "opscode-pushy-client"
@@ -71,7 +62,7 @@ package :msi do
   fast_msi true
   # Upgrade code for Chef MSI
   upgrade_code "D607A85C-BDFA-4F08-83ED-2ECB4DCD6BC5"
-  signing_identity "F74E1A68005E8A9C465C3D2FF7B41F3988F0EA09", machine_store: true
+  signing_identity "E05FF095D07F233B78EB322132BFF0F035E11B5B", machine_store: true
 
   parameters(
     ProjectLocationDir: 'push-jobs-client',

data/omnibus/config/software/opscode-pushy-client.rb

@@ -50,21 +50,22 @@ dependency "libxml2"
 dependency "libxslt"
 dependency "libiconv"
 dependency "liblzma"
-dependency "zlib"
+dependency "libzmq"
 
 # Core Requirements
+
+# Instead of trying to get all of FFI working on AIX we decided to build a custom C extension for the parts of
+# ZeroMQ that we need. We forked an old C native extension of LibZMQ, https://github.com/chef/rbzmq, and modified
+# it to fit our needs. This meant ripping out any unused code and updating only the methods we need
+# (like context.socket) to support later versions of Ruby and LibZMQ.
+dependency "rbzmq" if aix?
+
 dependency "rubygems"
 dependency "bundler"
 dependency "appbundler"
 dependency "chef"
 dependency "openssl-customization"
 
-if windows?
-  dependency "libzmq4x-windows"
-else
-  dependency "libzmq"
-end
-
 build do
   env = with_standard_compiler_flags(with_embedded_path)
 

data/omnibus/resources/push-jobs-client/msi/source.wxs.erb

@@ -91,8 +91,11 @@
                                   Arguments="[PROJECTLOCATION]$(var.PushJobsGemPath)\lib\pushy_client\windows_service.rb"
                                   DisplayName="!(loc.ServiceDisplayName)"
                                   Description="!(loc.ServiceDescription)" />
-                  <ServiceControl Id="ControlPushJobsClientService" Name="push-jobs-client"
-                                  Remove="both" Start="install" Stop="both" Wait="no" />
+                  <ServiceControl Id="ControlPushJobsClientService"
+                                  Name="push-jobs-client"
+                                  Remove="both"
+                                  Stop="both"
+                                  Wait="no" />
                 </Component>
               </Directory>
             </Directory>

data/omnibus_overrides.rb

@@ -0,0 +1,26 @@
+build_iteration 1
+
+# Using pins that agree with chef 13.0.118.
+override :chef,           version: "v13.4.24"
+override :ohai,           version: "v13.0.1"
+
+# Need modern bundler if we wish to support x-plat Gemfile.lock.
+# Unfortunately, 1.14.x series has issues with BUNDLER_VERSION variables exported by
+# the omnibus cookbook. Bump to it after the builders no longer set that environment
+# variable.
+override :bundler,        version: "1.15.4"
+override :rubygems,       version: "2.7.6"
+override :ruby,           version: "2.4.4"
+
+override "libxml2", version: "2.9.7"
+# Default in omnibus-software was too old.  Feel free to move this ahead as necessary.
+override :libsodium,      version: "1.0.12"
+if aix?
+  # To get LibZMQ building on AIX we needed to update to 4.2.2 because it has autotools and
+  # build configuration improvements.
+  override :libzmq,         version: "4.2.2"
+else
+  # Pick last version in 4.0.x that we have tested on windows.
+  # Feel free to bump this if you're willing to test out a newer version.
+  override :libzmq,         version: "4.0.7"
+end

data/opscode-pushy-client.gemspec

@@ -17,8 +17,8 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = '>= 2.2'
 
-  gem.add_dependency "chef", ">= 12.19", "< 14.0"
-  gem.add_dependency "ohai", ">= 8.23", "< 14.0"
+  gem.add_dependency "chef", ">= 12.19", "< 15.0"
+  gem.add_dependency "ohai", ">= 8.23", "< 15.0"
   gem.add_dependency "ffi-rzmq"
   gem.add_dependency "uuidtools"
 

data/spec/pushy_client/job_runner_spec.rb

@@ -0,0 +1,100 @@
+require "spec_helper"
+require "chef/log"
+require "pushy_client/job_runner"
+
+describe PushyClient::JobRunner do
+  describe "#start_process" do
+    let(:client) { double("client") }
+    let(:shellout) { double("shellout") }
+    let(:job_runner) { described_class.new(client) }
+    let(:whitelist) do
+      {
+        command => command
+      }
+    end
+
+    let(:opts) do
+      {
+        'user' => 'user',
+        'dir' => 'dir',
+        'env' => {}
+      }
+    end
+
+    let(:node_name) { 'node-name' }
+    let(:command) { 'command' }
+    let(:job_id) { 'id' }
+
+    let(:default_hash) do
+      {
+        'CHEF_PUSH_NODE_NAME' => node_name,
+        'CHEF_PUSH_JOB_ID' => job_id
+      }
+    end
+
+    subject(:start_process) do
+      job_runner.instance_variable_set(:@opts, opts)
+      job_runner.instance_variable_set(:@command, command)
+      job_runner.instance_variable_set(:@job_id, job_id)
+      job_runner.send(:start_process)
+    end
+
+    before :each do
+      allow(client).to receive(:node_name).and_return(node_name)
+      allow(client).to receive(:allowed_overwritable_env_vars)
+      allow(client).to receive(:whitelist).and_return(whitelist)
+      allow(Mixlib::ShellOut).to receive(:new).and_return(shellout)
+    end
+
+    context "When allowed_overwriteable_env_vars is nil" do
+      it "has only the default env variables if no others are specified" do
+        expect(Mixlib::ShellOut).to receive(:new).with(command, hash_including(
+          :env=>default_hash)).and_return(shellout)
+        start_process
+      end
+
+      it "uses the passed env vars" do
+        hash = {"foo" => "bar"}
+        hash_expected = default_hash.merge(hash)
+        opts['env'] = hash
+
+        expect(Mixlib::ShellOut).to receive(:new).with(command, hash_including(
+          :env=>hash_expected)).and_return(shellout)
+        start_process
+      end
+    end
+
+    context "When allowed_overwriteable_env_vars is not nil" do
+      before do
+        allow(client).to receive(:allowed_overwritable_env_vars).and_return(['foo'])
+      end
+
+      it "only returns the default env variables if no others are specified" do
+        expect(Mixlib::ShellOut).to receive(:new).with(command, hash_including(
+          :env=>hash_including(default_hash))).and_return(shellout)
+        start_process
+      end
+
+      it "uses the passed env vars when it's in the allowed list" do
+        hash = {"foo" => "bar"}
+        hash_expected = default_hash.merge(hash)
+        opts['env'] = hash
+
+        expect(Mixlib::ShellOut).to receive(:new).with(command, hash_including(
+          :env=>hash_expected)).and_return(shellout)
+        start_process
+      end
+
+      it "munges the passed env vars when it's not in the allowed list" do
+        hash = {"bar" => "bar"}
+        hash_expected = default_hash.merge("CHEF_PUSH_ENV_bar" => "bar")
+        opts['env'] = hash
+
+        expect(Mixlib::ShellOut).to receive(:new).with(command, hash_including(
+          :env=>hash_expected)).and_return(shellout)
+        start_process
+      end
+    end
+
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opscode-pushy-client
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.11
 platform: ruby
 authors:
 - Mark Anderson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-20 00:00:00.000000000 Z
+date: 2018-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -19,7 +19,7 @@ dependencies:
         version: '12.19'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '14.0'
+        version: '15.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '12.19'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '14.0'
+        version: '15.0'
 - !ruby/object:Gem::Dependency
   name: ohai
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +39,7 @@ dependencies:
         version: '8.23'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '14.0'
+        version: '15.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
         version: '8.23'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '14.0'
+        version: '15.0'
 - !ruby/object:Gem::Dependency
   name: ffi-rzmq
   requirement: !ruby/object:Gem::Requirement
@@ -150,8 +150,10 @@ files:
 - Gemfile.lock
 - LICENSE
 - README.md
+- RELEASE_NOTES.md
 - RELEASE_PROCESS.md
 - Rakefile
+- VERSION
 - bin/print_execution_environment
 - bin/push-apply
 - bin/pushy-client
@@ -201,8 +203,10 @@ files:
 - omnibus/resources/push-jobs-client/pkg/background.png
 - omnibus/resources/push-jobs-client/pkg/license.html.erb
 - omnibus/resources/push-jobs-client/pkg/welcome.html.erb
+- omnibus_overrides.rb
 - opscode-pushy-client.gemspec
-- pkg/opscode-pushy-client-2.3.0.gem
+- pkg/opscode-pushy-client-2.4.11.gem
+- spec/pushy_client/job_runner_spec.rb
 - spec/pushy_client/protocol_handler_spec.rb
 - spec/pushy_client/whitelist_spec.rb
 - spec/spec_helper.rb
@@ -225,11 +229,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Client for Chef push jobs server
 test_files:
+- spec/pushy_client/job_runner_spec.rb
 - spec/pushy_client/protocol_handler_spec.rb
 - spec/pushy_client/whitelist_spec.rb
 - spec/spec_helper.rb