chef-zero 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6c24fde8bb84962324a79c418978ec93fd52ac8
-  data.tar.gz: 71d24e21a84902b5caa06ff2a1d48e69a1615cca
+  metadata.gz: 724196a25d016237466c1536eff497dbdd1e2a1e
+  data.tar.gz: 4ebf2ae81da945160926ba408be3e6ce802d1d8d
 SHA512:
-  metadata.gz: 0ef14b23d22f1adcaf6551f15e505da9fe157e7015bbbaba0ae9448df6205777705501387e2d8a1d26872a42fa3e8e9fec1b3c868896273dd4e9e1424267d44a
-  data.tar.gz: 020842c6725b2d9b73c69434b435ca2e1b4cccec446a6f9a854628b9453b46e8f4ecb5f54386875cd799661e9198688d5b24d5f963a80eb614812047ff7679e3
+  metadata.gz: 5e6869dfcfee74354fa1438fa6b6289d7bccf7d24f932e0af67b8fc2bfe8499466ed624a78715a2e80f13280eb11a6c3fd49f5acf648c224bd8ef54890a9d39b
+  data.tar.gz: 7f03e15a3e895e1e7423c0061ce8e78ff7399d178a40f1da13ca99d0a79419d3baead62d4fc9546ccd0f4121f057bef2658bbc02f977ac9c8c2ce74e7a5be955

data/README.md

@@ -80,7 +80,7 @@ You may currently pass the following options to the initializer:
 - `debug` - run in debug mode to see all requests and responses (Default: false)
 
 
-CLI (Comand Line)
+CLI (Command Line)
 -----------------
 If you don't want to use Chef Zero as a library, you can simply start an instance
 with the included `chef-zero` executable:

data/lib/chef_zero/cookbook_data.rb

@@ -73,8 +73,8 @@ module ChefZero
         end
       end
 
-      def from_json(filepath)
-        self.merge!(JSON.parse(File.read(filepath)))
+      def from_json(json)
+        self.merge!(JSON.parse(json))
       end
 
       private

data/lib/chef_zero/server.rb

@@ -70,7 +70,6 @@ module ChefZero
 
     def initialize(options = {})
       @options = DEFAULT_OPTIONS.merge(options)
-      @options[:host] = "[#{@options[:host]}]" if @options[:host].include?(':')
       @options.freeze
 
       ChefZero::Log.level = @options[:log_level].to_sym
@@ -85,12 +84,19 @@ module ChefZero
     include ChefZero::Endpoints
 
     #
-    # The URL for this Chef Zero server.
+    # The URL for this Chef Zero server. If the given host is an IPV6 address,
+    # it is escaped in brackets according to RFC-2732.
+    #
+    # @see http://www.ietf.org/rfc/rfc2732.txt RFC-2732
     #
     # @return [String]
     #
     def url
-      "http://#{@options[:host]}:#{@options[:port]}"
+      @url ||= if @options[:host].include?(':')
+                 "http://[#{@options[:host]}]:#{@options[:port]}"
+               else
+                 "http://#{@options[:host]}:#{@options[:port]}"
+               end
     end
 
     #

data/lib/chef_zero/version.rb

@@ -1,3 +1,3 @@
 module ChefZero
-  VERSION = '2.0.1'
+  VERSION = '2.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-zero
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-03 00:00:00.000000000 Z
+date: 2014-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-log
@@ -38,20 +38,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: moneta
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - <
-      - !ruby/object:Gem::Version
-        version: 0.7.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - <
-      - !ruby/object:Gem::Version
-        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -197,7 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Self-contained, easy-setup, fast-start in-memory Chef server for testing