razor-client 0.12.0 → 0.13.0

data/Gemfile

@@ -1,5 +1,8 @@
 source 'https://rubygems.org'
 
+# mime-types is a dependency of rest-client. We need to explicitly depend
+# on it and pin its version to make sure this works with Ruby 1.8.7
+gem 'mime-types', '< 2.0'
 gem 'rest-client'
 gem 'terminal-table'
 

data/Gemfile.lock

@@ -38,6 +38,7 @@ PLATFORMS
 
 DEPENDENCIES
   kramdown
+  mime-types (< 2.0)
   rack-test
   rake
   rest-client

data/Rakefile

@@ -1,5 +1,15 @@
 require 'rake'
 require "bundler/gem_tasks"
+
+# Needed to make the client work on Ruby 1.8.7
+unless Kernel.respond_to?(:require_relative)
+  module Kernel
+    def require_relative(path)
+      require File.join(File.dirname(caller[0]), path.to_str)
+    end
+  end
+end
+
 require_relative 'spec/vcr_library'
 
 namespace :bundler do

data/bin/razor

@@ -1,5 +1,15 @@
 #!/usr/bin/env ruby
 
+# Needed to make the client work on Ruby 1.8.7
+unless Kernel.respond_to?(:require_relative)
+  module Kernel
+    def require_relative(path)
+      require File.join(File.dirname(caller[0]), path.to_str)
+    end
+  end
+end
+
+require 'rubygems'
 require_relative "../lib/razor/cli"
 
 include Razor::CLI::Format
@@ -35,7 +45,7 @@ rescue RestClient::Exception => e
   puts "Error from doing #{r.args[:method].to_s.upcase} #{r.args[:url]}"
   puts e.message
   begin
-    body = JSON::parse(r.body)
+    body = MultiJson::load(r.body)
     puts body.delete("details") if body["details"]
     unless body.empty?
       puts format_document(body)

data/lib/razor/cli/navigate.rb

@@ -1,5 +1,5 @@
 require 'rest-client'
-require 'json'
+require 'multi_json'
 require 'yaml'
 
 module Razor::CLI
@@ -68,7 +68,7 @@ module Razor::CLI
         end
       end
 
-      body = JSON::parse(File::read(body["json"])) if body["json"]
+      body = MultiJson::load(File::read(body["json"])) if body["json"]
       [cmd, body]
     end
 
@@ -107,14 +107,14 @@ module Razor::CLI
       unless response.headers[:content_type] =~ /application\/json/
        raise "Received content type #{response.headers[:content_type]}"
       end
-      JSON.parse(response.body)
+      MultiJson.load(response.body)
     end
 
     def json_post(url, body)
       headers = {  :accept=>:json, "Content-Type" => :json }
-      response = RestClient.post url, body.to_json, headers
+      response = RestClient.post url, MultiJson::dump(body), headers
       puts "POST #{url.to_s}\n#{body}\n-->\n#{response.body}" if @parse.dump_response?
-      JSON::parse(response.body)
+      MultiJson::load(response.body)
     end
 
     private
@@ -130,7 +130,7 @@ module Razor::CLI
 
     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
+      self.class.arg_type(cmd_name, arg_name) == "json" ? MultiJson::load(value) : value
     end
   end
 end

data/lib/razor/cli/parse.rb

@@ -15,7 +15,7 @@ module Razor::CLI
           @dump = true
         end
 
-        opts.on "-U", "--url URL",
+        opts.on "-u", "--url URL",
           "The full Razor API URL, can also be set\n" + " "*37 +
           "with the RAZOR_API environment variable\n" + " "*37 +
           "(default #{DEFAULT_RAZOR_API})" do |url|

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.12.0"
+  spec.version       = "0.13.0"
   spec.authors       = ["Puppet Labs"]
   spec.email         = ["info@puppetlabs.com"]
   spec.description   = "The client for the Razor server"
@@ -18,8 +18,12 @@ 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.required_ruby_version
 
+  # mime-types is a dependency of rest-client. We need to explicitly depend
+  # on it and pin its version to make sure the gem works with Ruby 1.8.7
+  spec.add_dependency "mime-types", '< 2.0'
+  spec.add_dependency "multi_json"
   spec.add_dependency "rest-client"
   spec.add_dependency "terminal-table"
 

data/spec/cli/navigate_spec.rb

@@ -1,3 +1,12 @@
+# Needed to make the client work on Ruby 1.8.7
+unless Kernel.respond_to?(:require_relative)
+  module Kernel
+    def require_relative(path)
+      require File.join(File.dirname(caller[0]), path.to_str)
+    end
+  end
+end
+
 require_relative '../spec_helper'
 
 describe Razor::CLI::Navigate do

data/spec/cli/parse_spec.rb

@@ -1,3 +1,12 @@
+# Needed to make the client work on Ruby 1.8.7
+unless Kernel.respond_to?(:require_relative)
+  module Kernel
+    def require_relative(path)
+      require File.join(File.dirname(caller[0]), path.to_str)
+    end
+  end
+end
+
 require "rspec/expectations"
 require_relative '../spec_helper'
 

data/spec/spec_helper.rb

@@ -3,7 +3,7 @@ SimpleCov.start do
   add_filter "/spec/"
 end
 
-require 'json'
+require 'multi_json'
 require 'vcr'
 
 require_relative '../lib/razor'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: razor-client
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,40 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-04 00:00:00.000000000 Z
+date: 2014-01-22 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - <
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - <
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -119,7 +151,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: