razor-client 0.11.0 → 0.12.0

data/README.md

@@ -5,12 +5,15 @@ backwards incompatible changes, especially to the database schema which
 would force you to rebuild all the machines that Razor is managing. Razor
 will become stable RSN.
 
-This is the command line client for the
-[Razor server](https://github.com/puppetlabs/razor-server) Please have a
-look at the Wiki over there for details.
+This is the command line client for the [Razor
+server](https://github.com/puppetlabs/razor-server) Please have a look at
+the Wiki over there for details, in particular, the [Getting
+Started](https://github.com/puppetlabs/razor-server/wiki/Getting-started)
+page contains instructions about installation and setup of the client.
 
 ## Getting in touch
 
+* bug/issue tracker: [RAZOR project in JIRA](https://tickets.puppetlabs.com/browse/RAZOR)
 * on IRC: `#puppet-razor` on [freenode](http://freenode.net/)
 * mailing list: [puppet-razor@googlegroups.com](http://groups.google.com/group/puppet-razor)
 

data/bin/razor

@@ -4,20 +4,32 @@ require_relative "../lib/razor/cli"
 
 include Razor::CLI::Format
 
-parse = Razor::CLI::Parse.new(ARGV)
+def die(message = nil)
+  puts "Error: #{message}" if message
+  exit 1
+end
+
+begin
+  parse = Razor::CLI::Parse.new(ARGV)
+rescue Razor::CLI::InvalidURIError => e
+  die e.message
+end
+
 if parse.show_help?
   puts parse.help
   exit 0
 end
+
 begin
   document = parse.navigate.get_document
   url = parse.navigate.last_url
   puts "From #{url}:\n\n#{format_document document}\n\n"
 rescue Razor::CLI::NavigationError => e
-  puts "Error: #{e}\n#{parse.help}\n\n"
+  die "#{e}\n#{parse.help}\n\n"
 rescue SocketError, Errno::ECONNREFUSED => e
   puts "Error: Could not connect to the server at #{parse.api_url}"
   puts "       #{e}\n"
+  die
 rescue RestClient::Exception => e
   r = e.response
   puts "Error from doing #{r.args[:method].to_s.upcase} #{r.args[:url]}"
@@ -33,4 +45,5 @@ rescue RestClient::Exception => e
     # what happened has failed. Just dump the response
     puts r.body
   end
+  die
 end

data/lib/razor/cli/format.rb

@@ -53,7 +53,11 @@ module Razor::CLI
         output = "#{f.rjust key_indent + 2}: "
         output << case value
         when Hash
-          "\n" + format_object(value, key_indent + 4).rstrip
+          if value.empty?
+            "{}"
+          else
+            "\n" + format_object(value, key_indent + 4).rstrip
+          end
         when Array
            if value.all? { |v| v.is_a?(String) }
              "[" + value.map(&:inspect).join(",") + "]"

data/lib/razor/cli/navigate.rb

@@ -67,10 +67,7 @@ module Razor::CLI
           body[$1] = convert_arg(cmd["name"], $1, ($3 || @segments.shift))
         end
       end
-      # Parse JSON-valued arguments
-      if cmd["name"] == "create-tag" && body["rule"]
-        body["rule"] = JSON::parse(body["rule"])
-      end
+
       body = JSON::parse(File::read(body["json"])) if body["json"]
       [cmd, body]
     end
@@ -87,6 +84,10 @@ module Razor::CLI
 
       if obj.is_a?(Hash) && obj["id"]
         @doc = json_get(obj["id"])
+        # strip the wrapper around collections
+        if @doc.is_a? Hash and @doc["items"].is_a? Array
+          @doc = @doc["items"]
+        end
         @doc_url = obj["id"]
       elsif obj.is_a? Hash
         @doc = obj
@@ -128,6 +129,7 @@ module Razor::CLI
     end
 
     def convert_arg(cmd_name, arg_name, value)
+      value = nil if value == "null"
       self.class.arg_type(cmd_name, arg_name) == "json" ? JSON::parse(value) : value
     end
   end

data/razor-client.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "razor-client"
-  spec.version       = "0.11.0"
+  spec.version       = "0.12.0"
   spec.authors       = ["Puppet Labs"]
   spec.email         = ["info@puppetlabs.com"]
   spec.description   = "The client for the Razor server"
@@ -18,6 +18,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^spec/})
   spec.require_paths = ["lib"]
 
+  spec.required_ruby_version = '>= 1.9.3'
+
   spec.add_dependency "rest-client"
   spec.add_dependency "terminal-table"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: razor-client
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-26 00:00:00.000000000 Z
+date: 2014-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -119,7 +119,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: