chef-zero 2.1 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f471a666e1d3e6bf940a786920438a6a956e10b
-  data.tar.gz: 15d364fda6c211d6f306909c5c7380830d9e66ad
+  metadata.gz: 06ef2b090b7ac3eed283205f44d61cd66c693c74
+  data.tar.gz: 14fb6b29d392f772e579685056499a4e053cf5eb
 SHA512:
-  metadata.gz: b3333fe38f5a88350b324ffae8889cd9440b66db783338aca651a77a1480b9e6f5aac3e122e57d046776ac327ede11f8422bb8f4cf260ff4326951771e7219dd
-  data.tar.gz: 1aaeb7212a5c29090a6b3f83d6a0a66f565c104e92e32c421cb1830c865c51f2377341b5e046f2e173ccd89ffd8f504abe44a5f6e703dc25fd2095318e2858dc
+  metadata.gz: 91a2192f2a50b203f19e6b45e8d911fb0fb304a5771b0721e49e47b587df40d33f53bdd59a8a83f119815929087f9b0aa2002ba983e9497c79c5e0f33c47d557
+  data.tar.gz: a82c744dbbacbc2841e8d11f9fdd17748393c8d1b9a5b8e713ce87876a521fc6ae3a8d0b55abb78a81e2fd8f84f9450ea1e7f190b4c12a0df32ee1d152a73d26

data/lib/chef_zero/data_store/v1_to_v2_adapter.rb

@@ -3,27 +3,25 @@ require 'chef_zero/data_store/interface_v2'
 module ChefZero
   module DataStore
     class V1ToV2Adapter < ChefZero::DataStore::InterfaceV2
-      def initialize(real_store, single_org)
+      def initialize(real_store, single_org, options = {})
         @real_store = real_store
         @single_org = single_org
-        # Handle defaults per V2 specification
-        @defaults = {
-          'organizations' => {
-            single_org => {
-              'clients' => {
-                'chef-validator' => '{ "validator": true }',
-                'chef-webui' => '{ "admin": true }'
-              },
-              'environments' => {
-                '_default' => '{ "description": "The default Chef environment" }'
-              },
-              'users' => {
-                'admin' => '{ "admin": "true" }'
-              }
-            }
-          }
+        org_defaults = options[:org_defaults] || {}
+        @defaults = { 'organizations' => { single_org => org_defaults }}
+      end
+
+      ORG_DEFAULTS = {
+        'clients' => {
+          'chef-validator' => '{ "validator": true }',
+          'chef-webui' => '{ "admin": true }'
+        },
+        'environments' => {
+          '_default' => '{ "description": "The default Chef environment" }'
+        },
+        'users' => {
+          'admin' => '{ "admin": "true" }'
         }
-      end
+      }
 
       attr_reader :real_store
       attr_reader :single_org

data/lib/chef_zero/server.rb

@@ -95,9 +95,9 @@ module ChefZero
     #
     def url
       @url ||= if @options[:host].include?(':')
-                 "http://[#{@options[:host]}]:#{@options[:port]}"
+                 URI("http://[#{@options[:host]}]:#{@options[:port]}").to_s
                else
-                 "http://#{@options[:host]}:#{@options[:port]}"
+                 URI("http://#{@options[:host]}:#{@options[:port]}").to_s
                end
     end
 
@@ -284,7 +284,6 @@ module ChefZero
     #   }
     # }
     def load_data(contents, org_name = 'chef')
-      data_store.create_dir('organizations', org_name)
       %w(clients environments nodes roles users).each do |data_type|
         if contents[data_type]
           dejsonize_children(contents[data_type]).each_pair do |name, data|

data/lib/chef_zero/version.rb

@@ -1,3 +1,3 @@
 module ChefZero
-  VERSION = '2.1'
+  VERSION = '2.1.1'
 end

data/spec/run.rb

@@ -23,6 +23,7 @@ def start_server(chef_repo_path)
   Chef::Config.versioned_cookbooks = true
   chef_fs = Chef::ChefFS::Config.new.local_fs
   data_store = Chef::ChefFS::ChefFSDataStore.new(chef_fs)
+  data_store = ChefZero::DataStore::V1ToV2Adapter.new(data_store, 'chef', :org_defaults => ChefZero::DataStore::V1ToV2Adapter::ORG_DEFAULTS)
   server = ChefZero::Server.new(:port => 8889, :data_store => data_store)#, :log_level => :debug)
   server.start_background
   server
@@ -35,6 +36,7 @@ begin
     require 'tmpdir'
     require 'fileutils'
     require 'chef/version'
+    require 'chef_zero/data_store/v1_to_v2_adapter'
 
     # Create chef repository
     tmpdir = Dir.mktmpdir

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-zero
 version: !ruby/object:Gem::Version
-  version: '2.1'
+  version: 2.1.1
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-26 00:00:00.000000000 Z
+date: 2014-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-log