vanagon 0.9.3 → 0.10.0

data/spec/lib/vanagon/environment_spec.rb

@@ -0,0 +1,176 @@
+require 'vanagon/environment'
+
+describe "Vanagon::Environment" do
+  before :all do
+    @good_names = %w(name _name NAME _NAME NAME123 _123NAME)
+    @bad_names = ['no-name', '!name', '.name', '123name_', 1, '-name']
+    @good_values =[
+      'valuable',
+      'most\ valuable',
+      'extremely-valuable',
+      'VALUE_BEYOND_MEASURE',
+      2004,
+      2007,
+    ]
+    @bad_values = [
+      %w(an array of strings),
+      19.81,
+      Object.new,
+      Tempfile.new('captain_planet'),
+      lambda { |x| "#{x}" }
+    ]
+
+    @good_hash = @good_names.zip(@good_values.shuffle).to_h
+    @bad_hash = @bad_names.zip(@bad_values.shuffle).to_h
+
+    @good_names_bad_values = @good_names.zip(@bad_values.shuffle).to_h
+    @bad_names_good_values = @bad_names.zip(@good_values.shuffle).to_h
+  end
+
+  before :each do
+    @local_env = Vanagon::Environment.new
+  end
+
+  describe "#[]" do
+    before do
+      @key = @good_names.sample
+      @value = @good_values.sample
+      @local_env[@key] = @value
+    end
+
+    it "returns values for matching keys" do
+      expect(@local_env[@key])
+        .to eq(@value)
+    end
+  end
+
+  describe "#[]=" do
+    it "accepts and assigns valid keys and values" do
+      @good_hash.each_pair do |key, value|
+        expect { @local_env[key] = value }
+            .to_not raise_error
+      end
+    end
+
+    it "raises an ArgumentError for invalid keys" do
+      @bad_names_good_values.each_pair do |key, value|
+          expect { @local_env[key] = value }
+            .to raise_error(ArgumentError)
+      end
+    end
+
+    it "raises an ArgumentError for invalid values" do
+      @good_names_bad_values.each_pair do |key, value|
+          expect { @local_env[key] = value }
+            .to raise_error(ArgumentError)
+      end
+    end
+  end
+
+  describe "#keys" do
+    before do
+      @good_hash.each_pair do |key, value|
+        @local_env[key] = value
+      end
+    end
+
+    it "returns an array of all keys in a populated Environment" do
+      # This is a little bit of a shell game. Array comparisons in Ruby rely
+      # on the order of the elements, not just the contents of the array.
+      # By randomizing our element order going in, and then using a set
+      # intersection (#&) and sorting the output, we can then compare the
+      # intersection against our sorted control group (@good_names).
+      # That should shake out if we have too many or too few keys.
+      expect(
+        (@local_env.keys.shuffle & @good_names.shuffle).sort
+      ).to eq(@good_names.sort)
+    end
+  end
+
+  describe "#values" do
+    before do
+      @good_hash.each_pair do |key, value|
+        @local_env[key] = value
+      end
+    end
+
+    it "returns an array of all values in a populated Environment" do
+      # Same "juggle some values" dance as #keys, except that #values
+      # may contain Integers or Strings and they are not directly comparable.
+      # We'll compare the hashed values of each element in the returned array
+      # against the hashed value of each element in the expected array instead.
+      expect(
+        (@local_env.values.shuffle & @good_values.shuffle)
+          .sort { |x, y| x.hash <=> y.hash }
+        ).to eq(@good_values.sort { |x, y| x.hash <=> y.hash })
+    end
+  end
+
+  describe "#merge" do
+    before do
+      @new_env = Vanagon::Environment.new
+      @new_env['__merge'] = "true"
+      @merged_values = @local_env.values + @new_env.values
+      @merged_keys = @local_env.keys + @new_env.keys
+      @merged_env = @local_env.merge(@new_env)
+    end
+
+    it "returns a new Environment Object" do
+      expect(@local_env.merge(@new_env).equal? @local_env)
+        .to be false
+    end
+
+    it "combines the keys of both Environments" do
+      expect(@merged_env.keys.sort { |x, y| x.hash <=> y.hash })
+        .to eq(@merged_keys.sort { |x, y| x.hash <=> y.hash })
+    end
+
+    it "combines the values of both Environments" do
+      expect(@merged_env.values.sort { |x, y| x.hash <=> y.hash })
+        .to eq(@merged_values.sort { |x, y| x.hash <=> y.hash })
+    end
+  end
+
+  describe "#merge!" do
+    before do
+      @new_env = Vanagon::Environment.new
+      @new_env['__merge'] = "true"
+      @merged_values = @local_env.values + @new_env.values
+      @merged_keys = @local_env.keys + @new_env.keys
+      @local_obj_id = @local_env.object_id
+    end
+
+    before do
+      @local_env.merge! @new_env
+    end
+
+    it "does not create a new Environment Object" do
+      expect(@local_env.object_id == @local_obj_id)
+        .to be true
+    end
+
+    it "combines the keys of both Environments" do
+      expect(@local_env.keys.sort { |x, y| x.hash <=> y.hash })
+        .to eq(@merged_keys.sort { |x, y| x.hash <=> y.hash })
+    end
+
+    it "combines the values of both Environments" do
+      expect(@local_env.values.sort { |x, y| x.hash <=> y.hash })
+        .to eq(@merged_values.sort { |x, y| x.hash <=> y.hash })
+    end
+  end
+
+  describe "#to_a" do
+    it "converts an Environment to an Array of Strings" do
+      expect(@local_env.to_a.select { |v| v.is_a? String }.sort)
+        .to eq(@local_env.to_a.sort)
+    end
+  end
+
+  describe "#to_s" do
+    it "correctly converts an Environment to a String" do
+      expect(@local_env.to_s.shellsplit)
+        .to eq(@local_env.to_a)
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,15 +1,25 @@
-require 'tmpdir'
-require 'vanagon'
-
+# Coverage configuration should come ahead of everything else.
+# This will ensure that code paths are followed appropriately.
 if ENV["COVERAGE"]
   require 'simplecov'
   SimpleCov.start do
     add_filter '.bundle'
     add_filter 'spec'
     add_filter 'vendor'
+
+    # Define a minimum coverage score, and fail if it's not met.
+    # This should probably be a Float, not an Integer but as
+    # long as it's not a String it's probably fine.
+    #
+    # The coverage score on 2017-02-07 for commit 770b67db was 71.85
+    # - Ryan McKern, 2017-02-07
+    minimum_coverage ENV['MINIMUM_SCORE'] || 70.00
   end
 end
 
+require 'tmpdir'
+require 'vanagon'
+
 RSpec.configure do |c|
   c.before do
     allow_any_instance_of(Vanagon::Component::Source::Git).to receive(:puts)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vanagon
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.10.0
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-01 00:00:00.000000000 Z
+date: 2017-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -96,6 +96,7 @@ files:
 - lib/vanagon/engine/hardware.rb
 - lib/vanagon/engine/local.rb
 - lib/vanagon/engine/pooler.rb
+- lib/vanagon/environment.rb
 - lib/vanagon/errors.rb
 - lib/vanagon/extensions/hashable.rb
 - lib/vanagon/extensions/ostruct/json.rb
@@ -131,6 +132,7 @@ files:
 - resources/deb/preinst.erb
 - resources/deb/prerm.erb
 - resources/deb/rules.erb
+- resources/metrics/profiling_shell.sh
 - resources/osx/postinstall.erb
 - resources/osx/preinstall.erb
 - resources/osx/project-installer.xml.erb
@@ -199,6 +201,7 @@ files:
 - spec/lib/vanagon/engine/hardware_spec.rb
 - spec/lib/vanagon/engine/local_spec.rb
 - spec/lib/vanagon/engine/pooler_spec.rb
+- spec/lib/vanagon/environment_spec.rb
 - spec/lib/vanagon/extensions/ostruct/json_spec.rb
 - spec/lib/vanagon/extensions/set/json_spec.rb
 - spec/lib/vanagon/extensions/string_spec.rb
@@ -235,41 +238,42 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.5
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 3
 summary: All of your packages will fit into this van with this one simple trick.
 test_files:
-- spec/lib/makefile_spec.rb
 - spec/lib/vanagon/common/pathname_spec.rb
 - spec/lib/vanagon/common/user_spec.rb
-- spec/lib/vanagon/component/dsl_spec.rb
-- spec/lib/vanagon/component/rules_spec.rb
 - spec/lib/vanagon/component/source/git_spec.rb
 - spec/lib/vanagon/component/source/http_spec.rb
 - spec/lib/vanagon/component/source/local_spec.rb
 - spec/lib/vanagon/component/source_spec.rb
-- spec/lib/vanagon/component_spec.rb
-- spec/lib/vanagon/driver_spec.rb
-- spec/lib/vanagon/engine/always_be_scheduling_spec.rb
+- spec/lib/vanagon/component/dsl_spec.rb
+- spec/lib/vanagon/component/rules_spec.rb
 - spec/lib/vanagon/engine/base_spec.rb
+- spec/lib/vanagon/engine/always_be_scheduling_spec.rb
 - spec/lib/vanagon/engine/docker_spec.rb
 - spec/lib/vanagon/engine/ec2_spec.rb
 - spec/lib/vanagon/engine/hardware_spec.rb
 - spec/lib/vanagon/engine/local_spec.rb
 - spec/lib/vanagon/engine/pooler_spec.rb
-- spec/lib/vanagon/extensions/ostruct/json_spec.rb
-- spec/lib/vanagon/extensions/set/json_spec.rb
-- spec/lib/vanagon/extensions/string_spec.rb
-- spec/lib/vanagon/optparse_spec.rb
+- spec/lib/vanagon/platform/solaris_11_spec.rb
 - spec/lib/vanagon/platform/deb_spec.rb
 - spec/lib/vanagon/platform/dsl_spec.rb
 - spec/lib/vanagon/platform/rpm/aix_spec.rb
 - spec/lib/vanagon/platform/rpm_spec.rb
-- spec/lib/vanagon/platform/solaris_11_spec.rb
 - spec/lib/vanagon/platform/windows_spec.rb
-- spec/lib/vanagon/platform_spec.rb
 - spec/lib/vanagon/project/dsl_spec.rb
+- spec/lib/vanagon/extensions/ostruct/json_spec.rb
+- spec/lib/vanagon/extensions/set/json_spec.rb
+- spec/lib/vanagon/extensions/string_spec.rb
+- spec/lib/vanagon/optparse_spec.rb
+- spec/lib/vanagon/platform_spec.rb
 - spec/lib/vanagon/project_spec.rb
 - spec/lib/vanagon/utilities/shell_utilities_spec.rb
 - spec/lib/vanagon/utilities_spec.rb
+- spec/lib/vanagon/environment_spec.rb
+- spec/lib/vanagon/component_spec.rb
+- spec/lib/vanagon/driver_spec.rb
+- spec/lib/makefile_spec.rb