razor-client 1.9.4 → 1.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 7240c2a4e68fab8d04ae7084b400d7a7bd472858c2190b3dca337577e5aa5cf7
-  data.tar.gz: 3f3b980e70b2d2de30f8fb49f4b8a34ad6ac67daf4e76b2d944250b1dd09894c
+SHA1:
+  metadata.gz: e1defb4bea2f1d1998d77782490f2e4828ecfd29
+  data.tar.gz: 7f98e0a1282e359e159ea9e2983551d72d8cf790
 SHA512:
-  metadata.gz: cf8b0cf692487781a22c34b2df625ad729a39fc283fb3cc3b6abd0beefec6d8392b1d10a33eeae05d94f21677ea5cf36f9755fc6365d1ca38862fbadad7b7a9c
-  data.tar.gz: 5c56d03d1161b3c9d74c66b9ddb82123e072e24cebd7e42f703d579cc13d1e696f40d259670b673773ffb1b234fb76a38876528bdb7a6642199a61331a6a013e
+  metadata.gz: b5daf070483c704837ab46c11bb4d33ed15af45aa5c852915ec52ba1c2b2f1090d17dc50705ff4531ce0f29d5e3d2accac5d681cb067b81fa2e23beb894d41a5
+  data.tar.gz: a6cce4845b41e97498ec1e4b25df325d7ed17203f8a51984cd25315b0b28837d6b97e359c567971d258ba530601215239fb19f33298ad0a548ebcde36396698b

data/NEWS.md

@@ -1,5 +1,10 @@
 # Razor Client Release Notes
 
+## 1.9.5 - 2019-08-29
+
+* BUGFIX: Fixed handling of boolean arguments, e.g. `--enabled` in
+  `create-policy`, where the following arguments were not delineated properly.
+
 ## 1.9.4 - 2019-08-26
 
 * IMPROVEMENT: Moved from `rest-client` to `faraday` due to increasing

data/lib/razor/cli/command.rb

@@ -35,7 +35,7 @@ class Razor::CLI::Command
         # `--arg=value`/`--arg value`
         # `-a=value`/`-a value`
         arg_name, value = [$1, $3]
-        value = @segments.shift if value.nil? && @segments[0] !~ /^-[a-z]/
+        value = @segments.shift if value.nil? && @segments[0] !~ /^-[-]?[a-z]/
         arg_name = self.class.resolve_alias(arg_name, @cmd_schema)
         body[arg_name] = self.class.convert_arg(arg_name, value, body[arg_name], @cmd_schema)
       elsif argument =~ /\A-([a-z][a-z_-]+)(=(.+))?\Z/ and
@@ -127,7 +127,9 @@ class Razor::CLI::Command
               {argument_name: arg_name, error: error.message}
         end
       when "boolean"
-        ["true", nil].include?(value)
+        raise ArgumentError, _("Invalid boolean for argument '%{argument_name}': %{value}") %
+            {argument_name: arg_name, value: value} unless ["true", "false", nil].include?(value)
+        value != "false"
       when "number"
         begin
           Integer(value)

data/spec/cli/command_spec.rb

@@ -60,6 +60,16 @@ describe Razor::CLI::Command do
             to raise_error(ArgumentError, /Expected nothing for argument 'tags', but was: 'abc'/)
       end
     end
+    context "boolean conversion" do
+      it "errors when anything besides 'true', 'false' or nil are provided" do
+        cmd_schema = {"enabled"=>{"type"=>"boolean"}}
+        expect{Command.convert_arg('enabled', 'abc', existing_value, cmd_schema)}.
+            to raise_error(ArgumentError, /Invalid boolean for argument 'enabled': abc/)
+        expect(Command.convert_arg('enabled', 'true', existing_value, cmd_schema)).to eq(true)
+        expect(Command.convert_arg('enabled', nil, existing_value, cmd_schema)).to eq(true)
+        expect(Command.convert_arg('enabled', 'false', existing_value, cmd_schema)).to eq(false)
+      end
+    end
   end
 
   context "resolve_alias" do
@@ -104,6 +114,9 @@ describe Razor::CLI::Command do
       it "succeeds with a double dash for long flags" do
         extract({'schema' => {'name' => {'type' => 'array'}}},
                 ['--name', 'abc'])['name'].should == ['abc']
+        extract({'schema' => {'true' => {'type' => 'boolean'},
+                                      'other' => {'type' => 'number'}}},
+                ['--true', '--other', '123'])['true'].should be_true
       end
       it "succeeds with a single dash for short flags" do
         c = Razor::CLI::Command.new(nil, nil, {'schema' => {'n' => {'type' => 'array'}}},

metadata

@@ -1,108 +1,108 @@
 --- !ruby/object:Gem::Specification
 name: razor-client
 version: !ruby/object:Gem::Version
-  version: 1.9.4
+  version: 1.9.5
 platform: ruby
 authors:
 - Puppet Labs
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-08-26 00:00:00.000000000 Z
+date: 2019-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  name: mime-types
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  name: multi_json
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.15'
-  type: :runtime
+  name: faraday
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.15'
 - !ruby/object:Gem::Dependency
-  name: command_line_reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-  type: :runtime
+  name: command_line_reporter
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: gettext-setup
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.31'
-  type: :runtime
+  name: gettext-setup
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.31'
 - !ruby/object:Gem::Dependency
-  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  name: bundler
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  name: rake
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -201,7 +201,7 @@ homepage: https://github.com/puppetlabs/razor-client
 licenses:
 - ASL2
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -216,8 +216,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.6.6
+signing_key:
 specification_version: 4
 summary: The client for everybody's favorite provisioning tool
 test_files: