chef-zero 4.3.0 → 4.3.1

data/lib/chef_zero/endpoints/environment_cookbooks_endpoint.rb

@@ -1,22 +1,22 @@
-require 'ffi_yajl'
-require 'chef_zero/endpoints/cookbooks_base'
-
-module ChefZero
-  module Endpoints
-    # /environments/NAME/cookbooks
-    class EnvironmentCookbooksEndpoint < CookbooksBase
-      def get(request)
-        environment = FFI_Yajl::Parser.parse(get_data(request, request.rest_path[0..3]), :create_additions => false)
-        constraints = environment['cookbook_versions'] || {}
-        if request.query_params['num_versions'] == 'all'
-          num_versions = nil
-        elsif request.query_params['num_versions']
-          num_versions = request.query_params['num_versions'].to_i
-        else
-          num_versions = 1
-        end
-        json_response(200, format_cookbooks_list(request, all_cookbooks_list(request), constraints, num_versions))
-      end
-    end
-  end
-end
+require 'ffi_yajl'
+require 'chef_zero/endpoints/cookbooks_base'
+
+module ChefZero
+  module Endpoints
+    # /environments/NAME/cookbooks
+    class EnvironmentCookbooksEndpoint < CookbooksBase
+      def get(request)
+        environment = FFI_Yajl::Parser.parse(get_data(request, request.rest_path[0..3]), :create_additions => false)
+        constraints = environment['cookbook_versions'] || {}
+        if request.query_params['num_versions'] == 'all'
+          num_versions = nil
+        elsif request.query_params['num_versions']
+          num_versions = request.query_params['num_versions'].to_i
+        else
+          num_versions = 1
+        end
+        json_response(200, format_cookbooks_list(request, all_cookbooks_list(request), constraints, num_versions))
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/environment_endpoint.rb

@@ -1,33 +1,33 @@
-require 'ffi_yajl'
-require 'chef_zero/endpoints/rest_object_endpoint'
-require 'chef_zero/chef_data/data_normalizer'
-
-module ChefZero
-  module Endpoints
-    # /environments/NAME
-    class EnvironmentEndpoint < RestObjectEndpoint
-      def delete(request)
-        if request.rest_path[3] == "_default"
-          # 405, really?
-          error(405, "The '_default' environment cannot be modified.")
-        else
-          super(request)
-        end
-      end
-
-      def put(request)
-        if request.rest_path[3] == "_default"
-          error(405, "The '_default' environment cannot be modified.")
-        else
-          super(request)
-        end
-      end
-
-      def populate_defaults(request, response_json)
-        response = FFI_Yajl::Parser.parse(response_json, :create_additions => false)
-        response = ChefData::DataNormalizer.normalize_environment(response, request.rest_path[3])
-        FFI_Yajl::Encoder.encode(response, :pretty => true)
-      end
-    end
-  end
-end
+require 'ffi_yajl'
+require 'chef_zero/endpoints/rest_object_endpoint'
+require 'chef_zero/chef_data/data_normalizer'
+
+module ChefZero
+  module Endpoints
+    # /environments/NAME
+    class EnvironmentEndpoint < RestObjectEndpoint
+      def delete(request)
+        if request.rest_path[3] == "_default"
+          # 405, really?
+          error(405, "The '_default' environment cannot be modified.")
+        else
+          super(request)
+        end
+      end
+
+      def put(request)
+        if request.rest_path[3] == "_default"
+          error(405, "The '_default' environment cannot be modified.")
+        else
+          super(request)
+        end
+      end
+
+      def populate_defaults(request, response_json)
+        response = FFI_Yajl::Parser.parse(response_json, :create_additions => false)
+        response = ChefData::DataNormalizer.normalize_environment(response, request.rest_path[3])
+        FFI_Yajl::Encoder.encode(response, :pretty => true)
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/environment_nodes_endpoint.rb

@@ -1,23 +1,23 @@
-require 'ffi_yajl'
-require 'chef_zero/rest_base'
-
-module ChefZero
-  module Endpoints
-    # /environment/NAME/nodes
-    class EnvironmentNodesEndpoint < RestBase
-      def get(request)
-        # 404 if environment does not exist
-        get_data(request, request.rest_path[0..3])
-
-        result = {}
-        list_data(request, request.rest_path[0..1] + ['nodes']).each do |name|
-          node = FFI_Yajl::Parser.parse(get_data(request, request.rest_path[0..1] + ['nodes', name]), :create_additions => false)
-          if node['chef_environment'] == request.rest_path[3]
-            result[name] = build_uri(request.base_uri, request.rest_path[0..1] + ['nodes', name])
-          end
-        end
-        json_response(200, result)
-      end
-    end
-  end
-end
+require 'ffi_yajl'
+require 'chef_zero/rest_base'
+
+module ChefZero
+  module Endpoints
+    # /environment/NAME/nodes
+    class EnvironmentNodesEndpoint < RestBase
+      def get(request)
+        # 404 if environment does not exist
+        get_data(request, request.rest_path[0..3])
+
+        result = {}
+        list_data(request, request.rest_path[0..1] + ['nodes']).each do |name|
+          node = FFI_Yajl::Parser.parse(get_data(request, request.rest_path[0..1] + ['nodes', name]), :create_additions => false)
+          if node['chef_environment'] == request.rest_path[3]
+            result[name] = build_uri(request.base_uri, request.rest_path[0..1] + ['nodes', name])
+          end
+        end
+        json_response(200, result)
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/environment_recipes_endpoint.rb

@@ -1,22 +1,22 @@
-require 'ffi_yajl'
-require 'chef_zero/endpoints/cookbooks_base'
-
-module ChefZero
-  module Endpoints
-    # /environment/NAME/recipes
-    class EnvironmentRecipesEndpoint < CookbooksBase
-      def get(request)
-        environment = FFI_Yajl::Parser.parse(get_data(request, request.rest_path[0..3]), :create_additions => false)
-        constraints = environment['cookbook_versions'] || {}
-        result = []
-        filter_cookbooks(all_cookbooks_list(request), constraints, 1) do |name, versions|
-          if versions.size > 0
-            cookbook = FFI_Yajl::Parser.parse(get_data(request, request.rest_path[0..1] + ['cookbooks', name, versions[0]]), :create_additions => false)
-            result += recipe_names(name, cookbook)
-          end
-        end
-        json_response(200, result.sort)
-      end
-    end
-  end
-end
+require 'ffi_yajl'
+require 'chef_zero/endpoints/cookbooks_base'
+
+module ChefZero
+  module Endpoints
+    # /environment/NAME/recipes
+    class EnvironmentRecipesEndpoint < CookbooksBase
+      def get(request)
+        environment = FFI_Yajl::Parser.parse(get_data(request, request.rest_path[0..3]), :create_additions => false)
+        constraints = environment['cookbook_versions'] || {}
+        result = []
+        filter_cookbooks(all_cookbooks_list(request), constraints, 1) do |name, versions|
+          if versions.size > 0
+            cookbook = FFI_Yajl::Parser.parse(get_data(request, request.rest_path[0..1] + ['cookbooks', name, versions[0]]), :create_additions => false)
+            result += recipe_names(name, cookbook)
+          end
+        end
+        json_response(200, result.sort)
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/environment_role_endpoint.rb

@@ -1,36 +1,36 @@
-require 'ffi_yajl'
-require 'chef_zero/endpoints/cookbooks_base'
-
-module ChefZero
-  module Endpoints
-    # /environments/NAME/roles/NAME
-    # /roles/NAME/environments/NAME
-    class EnvironmentRoleEndpoint < CookbooksBase
-      def get(request)
-        # 404 if environment does not exist
-        if request.rest_path[2] == 'environments'
-          environment_path = request.rest_path[0..1] + request.rest_path[2..3]
-          role_path = request.rest_path[0..1] + request.rest_path[4..5]
-        else
-          environment_path = request.rest_path[0..1] + request.rest_path[4..5]
-          role_path = request.rest_path[0..1] + request.rest_path[2..3]
-        end
-        # Verify that the environment exists
-        get_data(request, environment_path)
-
-        role = FFI_Yajl::Parser.parse(get_data(request, role_path), :create_additions => false)
-        environment_name = environment_path[3]
-        if environment_name == '_default'
-          run_list = role['run_list']
-        else
-          if role['env_run_lists']
-            run_list = role['env_run_lists'][environment_name]
-          else
-            run_list = nil
-          end
-        end
-        json_response(200, { 'run_list' => run_list })
-      end
-    end
-  end
-end
+require 'ffi_yajl'
+require 'chef_zero/endpoints/cookbooks_base'
+
+module ChefZero
+  module Endpoints
+    # /environments/NAME/roles/NAME
+    # /roles/NAME/environments/NAME
+    class EnvironmentRoleEndpoint < CookbooksBase
+      def get(request)
+        # 404 if environment does not exist
+        if request.rest_path[2] == 'environments'
+          environment_path = request.rest_path[0..1] + request.rest_path[2..3]
+          role_path = request.rest_path[0..1] + request.rest_path[4..5]
+        else
+          environment_path = request.rest_path[0..1] + request.rest_path[4..5]
+          role_path = request.rest_path[0..1] + request.rest_path[2..3]
+        end
+        # Verify that the environment exists
+        get_data(request, environment_path)
+
+        role = FFI_Yajl::Parser.parse(get_data(request, role_path), :create_additions => false)
+        environment_name = environment_path[3]
+        if environment_name == '_default'
+          run_list = role['run_list']
+        else
+          if role['env_run_lists']
+            run_list = role['env_run_lists'][environment_name]
+          else
+            run_list = nil
+          end
+        end
+        json_response(200, { 'run_list' => run_list })
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/file_store_file_endpoint.rb

@@ -1,22 +1,22 @@
-require 'chef_zero/rest_base'
-
-module ChefZero
-  module Endpoints
-    # The minimum amount of S3 necessary to support cookbook upload/download
-    # /organizations/NAME/file_store/FILE
-    class FileStoreFileEndpoint < RestBase
-      def json_only
-        false
-      end
-
-      def get(request)
-        [200, {"Content-Type" => 'application/x-binary'}, get_data(request) ]
-      end
-
-      def put(request)
-        data_store.set(request.rest_path, request.body, :create, :create_dir, :requestor => request.requestor)
-        json_response(200, {})
-      end
-    end
-  end
-end
+require 'chef_zero/rest_base'
+
+module ChefZero
+  module Endpoints
+    # The minimum amount of S3 necessary to support cookbook upload/download
+    # /organizations/NAME/file_store/FILE
+    class FileStoreFileEndpoint < RestBase
+      def json_only
+        false
+      end
+
+      def get(request)
+        [200, {"Content-Type" => 'application/x-binary'}, get_data(request) ]
+      end
+
+      def put(request)
+        data_store.set(request.rest_path, request.body, :create, :create_dir, :requestor => request.requestor)
+        json_response(200, {})
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/group_endpoint.rb

@@ -1,20 +1,20 @@
-require 'ffi_yajl'
-require 'chef_zero/endpoints/rest_object_endpoint'
-require 'chef_zero/chef_data/data_normalizer'
-
-module ChefZero
-  module Endpoints
-    # /organizations/ORG/groups/NAME
-    class GroupEndpoint < RestObjectEndpoint
-      def initialize(server)
-        super(server, %w(id groupname))
-      end
-
-      def populate_defaults(request, response_json)
-        group = FFI_Yajl::Parser.parse(response_json, :create_additions => false)
-        group = ChefData::DataNormalizer.normalize_group(group, request.rest_path[3], request.rest_path[1])
-        FFI_Yajl::Encoder.encode(group, :pretty => true)
-      end
-    end
-  end
-end
+require 'ffi_yajl'
+require 'chef_zero/endpoints/rest_object_endpoint'
+require 'chef_zero/chef_data/data_normalizer'
+
+module ChefZero
+  module Endpoints
+    # /organizations/ORG/groups/NAME
+    class GroupEndpoint < RestObjectEndpoint
+      def initialize(server)
+        super(server, %w(id groupname))
+      end
+
+      def populate_defaults(request, response_json)
+        group = FFI_Yajl::Parser.parse(response_json, :create_additions => false)
+        group = ChefData::DataNormalizer.normalize_group(group, request.rest_path[3], request.rest_path[1])
+        FFI_Yajl::Encoder.encode(group, :pretty => true)
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/groups_endpoint.rb

@@ -1,13 +1,13 @@
-require 'ffi_yajl'
-require 'chef_zero/endpoints/rest_list_endpoint'
-
-module ChefZero
-  module Endpoints
-    # /organizations/ORG/groups/NAME
-    class GroupsEndpoint < RestListEndpoint
-      def initialize(server)
-        super(server, %w(id groupname))
-      end
-    end
-  end
-end
+require 'ffi_yajl'
+require 'chef_zero/endpoints/rest_list_endpoint'
+
+module ChefZero
+  module Endpoints
+    # /organizations/ORG/groups/NAME
+    class GroupsEndpoint < RestListEndpoint
+      def initialize(server)
+        super(server, %w(id groupname))
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/license_endpoint.rb

@@ -1,25 +1,25 @@
-require 'ffi_yajl'
-require 'chef_zero/rest_base'
-
-module ChefZero
-  module Endpoints
-    # /license
-    class LicenseEndpoint < RestBase
-      MAX_NODE_COUNT = 25
-
-      def get(request)
-        node_count = 0
-        list_data(request, [ 'organizations' ]).each do |orgname|
-          node_count += list_data(request, [ 'organizations', orgname, 'nodes' ]).size
-        end
-
-        json_response(200, {
-          "limit_exceeded" => (node_count > MAX_NODE_COUNT) ? true : false,
-          "node_license" => MAX_NODE_COUNT,
-          "node_count" => node_count,
-          "upgrade_url" => 'http://blah.com'
-        })
-      end
-    end
-  end
-end
+require 'ffi_yajl'
+require 'chef_zero/rest_base'
+
+module ChefZero
+  module Endpoints
+    # /license
+    class LicenseEndpoint < RestBase
+      MAX_NODE_COUNT = 25
+
+      def get(request)
+        node_count = 0
+        list_data(request, [ 'organizations' ]).each do |orgname|
+          node_count += list_data(request, [ 'organizations', orgname, 'nodes' ]).size
+        end
+
+        json_response(200, {
+          "limit_exceeded" => (node_count > MAX_NODE_COUNT) ? true : false,
+          "node_license" => MAX_NODE_COUNT,
+          "node_count" => node_count,
+          "upgrade_url" => 'http://blah.com'
+        })
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/node_endpoint.rb

@@ -1,17 +1,17 @@
-require 'ffi_yajl'
-require 'chef_zero/endpoints/rest_object_endpoint'
-require 'chef_zero/chef_data/data_normalizer'
-
-module ChefZero
-  module Endpoints
-    # /nodes/ID
-    class NodeEndpoint < RestObjectEndpoint
-      def populate_defaults(request, response_json)
-        node = FFI_Yajl::Parser.parse(response_json, :create_additions => false)
-        node = ChefData::DataNormalizer.normalize_node(node, request.rest_path[3])
-        FFI_Yajl::Encoder.encode(node, :pretty => true)
-      end
-    end
-  end
-end
-
+require 'ffi_yajl'
+require 'chef_zero/endpoints/rest_object_endpoint'
+require 'chef_zero/chef_data/data_normalizer'
+
+module ChefZero
+  module Endpoints
+    # /nodes/ID
+    class NodeEndpoint < RestObjectEndpoint
+      def populate_defaults(request, response_json)
+        node = FFI_Yajl::Parser.parse(response_json, :create_additions => false)
+        node = ChefData::DataNormalizer.normalize_node(node, request.rest_path[3])
+        FFI_Yajl::Encoder.encode(node, :pretty => true)
+      end
+    end
+  end
+end
+