chef-server-api 0.8.16 → 0.9.0.a3

data/lib/chef-server-api.rb

@@ -1,158 +1,2 @@
-if defined?(Merb::Plugins)
-  $:.unshift File.dirname(__FILE__)
-  $:.unshift File.join(File.dirname(__FILE__), "..", "..", "chef-solr", "lib")
-  $:.unshift File.join(File.dirname(__FILE__), "..", "..", "chef", "lib")
-
-  dependency 'merb-slices', :immediate => true
-  dependency 'chef', :immediate=>true unless defined?(Chef)
-  dependency 'bunny', :immediate=>true 
-  dependency 'uuidtools', :immediate=>true 
-
-  require 'chef/role'
-  require 'chef/data_bag'
-  require 'chef/data_bag_item'
-  require 'chef/api_client'
-  require 'chef/webui_user'
-  require 'chef/certificate'
-
-  require 'mixlib/authentication'
-
-  require 'chef/data_bag'
-  require 'chef/data_bag_item'
-  require 'ohai'
-  require 'openssl'
-
-  Merb::Plugins.add_rakefiles "chef-server-api/merbtasks", "chef-server-api/slicetasks", "chef-server-api/spectasks"
-
-  # Register the Slice for the current host application
-  Merb::Slices::register(__FILE__)
-
-  Merb.disable :json
-
-  # Slice configuration - set this in a before_app_loads callback.
-  # By default a Slice uses its own layout, so you can switch to
-  # the main application layout or no layout at all if needed.
-  #
-  # Configuration options:
-  # :layout - the layout to use; defaults to :chefserverslice
-  # :mirror - which path component types to use on copy operations; defaults to all
-  Merb::Slices::config[:chef_server_api][:layout] ||= :chef_server_api
-  
-  # All Slice code is expected to be namespaced inside a module
-  module ChefServerApi
-    # Slice metadata
-    self.description = "ChefServerApi.. serving up some piping hot infrastructure!"
-    self.version = Chef::VERSION
-    self.author = "Opscode"
-
-    # Stub classes loaded hook - runs before LoadClasses BootLoader
-    # right after a slice's classes have been loaded internally.
-    def self.loaded
-      Chef::Log.info("Compiling routes... (totally normal to see 'Cannot find resource model')")
-    end
-
-    # Initialization hook - runs before AfterAppLoads BootLoader
-    def self.init
-    end
-
-    # Activation hook - runs after AfterAppLoads BootLoader
-    def self.activate
-      Mixlib::Authentication::Log.logger = Ohai::Log.logger = Chef::Log.logger 
-
-      unless Merb::Config.environment == "test"
-        # create the couch design docs for nodes, roles, and databags
-        Chef::CouchDB.new.create_id_map
-        Chef::Node.create_design_document
-        Chef::Role.create_design_document
-        Chef::DataBag.create_design_document
-        Chef::ApiClient.create_design_document
-        Chef::WebUIUser.create_design_document
-        
-        # Create the signing key and certificate 
-        Chef::Certificate.generate_signing_ca
-
-        # Generate the validation key
-        Chef::Certificate.gen_validation_key
-
-        # Generate the Web UI Key 
-        Chef::Certificate.gen_validation_key(Chef::Config[:web_ui_client_name], Chef::Config[:web_ui_key], true)
-        
-        Chef::Log.info('Loading roles')
-        Chef::Role.sync_from_disk_to_couchdb
-      end
-    end
-
-    # Deactivation hook - triggered by Merb::Slices.deactivate(Chefserver)
-    def self.deactivate
-    end
-
-    # Setup routes inside the host application
-    #
-    # @param scope<Merb::Router::Behaviour>
-    #  Routes will be added within this scope (namespace). In fact, any
-    #  router behaviour is a valid namespace, so you can attach
-    #  routes at any level of your router setup.
-    #
-    # @note prefix your named routes with :chefserverslice_
-    #   to avoid potential conflicts with global named routes.
-    def self.setup_router(scope)
-      # Users
-      scope.resources :users
-      
-      # Nodes
-      scope.resources :nodes, :id => /[^\/]+/
-      scope.match('/nodes/:id/cookbooks',
-                  :id => /[^\/]+/,
-                  :method => 'get').
-                  to(:controller => "nodes", :action => "cookbooks")
-      # Roles
-      scope.resources :roles
-
-      # Status
-      scope.match("/status").to(:controller => "status", :action => "index").name(:status)
-
-      # Clients
-      scope.match("/clients", :method=>"post").to(:controller=>'clients', :action=>'create')
-      scope.match("/clients", :method=>"get").to(:controller=>'clients', :action=>'index').name(:clients)
-      scope.match("/clients/:id", :id => /[\w\.-]+/, :method=>"get").to(:controller=>'clients', :action=>'show').name(:client)
-      scope.match("/clients/:id", :id => /[\w\.-]+/, :method=>"put").to(:controller=>'clients', :action=>'update')
-      scope.match("/clients/:id", :id => /[\w\.-]+/, :method=>"delete").to(:controller=>'clients', :action=>'destroy')
-
-      # Search
-      scope.resources :search
-      scope.match('/search/reindex', :method => 'post').to(:controller => "search", :action => "reindex")
-
-      # Cookbooks        
-      scope.match('/nodes/:id/cookbooks', :method => 'get').to(:controller => "nodes", :action => "cookbooks")
-
-      scope.resources :cookbooks
-      scope.match("/cookbooks/:cookbook_id/_content", :method => 'get', :cookbook_id => /[\w\.]+/).to(:controller => "cookbooks", :action => "get_tarball")
-      scope.match("/cookbooks/:cookbook_id/_content", :method => 'put', :cookbook_id => /[\w\.]+/).to(:controller => "cookbooks", :action => "update")
-      scope.match("/cookbooks/:cookbook_id/:segment", :cookbook_id => /[\w\.]+/).to(:controller => "cookbooks", :action => "show_segment").name(:cookbook_segment)
-
-      # Data
-      scope.match("/data/:data_bag_id/:id", :method => 'get').to(:controller => "data_item", :action => "show").name("data_bag_item")
-      scope.match("/data/:data_bag_id", :method => 'post').to(:controller => "data_item", :action => "create").name("create_data_bag_item")
-      scope.match("/data/:data_bag_id/:id", :method => 'put').to(:controller => "data_item", :action => "update").name("update_data_bag_item")
-      scope.match("/data/:data_bag_id/:id", :method => 'delete').to(:controller => "data_item", :action => "destroy").name("destroy_data_bag_item")
-      scope.resources :data
-
-      scope.match('/').to(:controller => 'main', :action =>'index').name(:top)
-    end
-  end
-  
-
-  # Setup the slice layout for ChefServerApi
-  #
-  # Use ChefServerApi.push_path and ChefServerApi.push_app_path
-  # to set paths to chefserver-level and app-level paths. Example:
-  #
-  # ChefServerApi.push_path(:application, ChefServerApi.root)
-  # ChefServerApi.push_app_path(:application, Merb.root / 'slices' / 'chefserverslice')
-  # ...
-  #
-  # Any component path that hasn't been set will default to ChefServerApi.root
-  #
-  # Or just call setup_default_structure! to setup a basic Merb MVC structure.
-  ChefServerApi.setup_default_structure!
-end
+CHEF_SERVER_VERSION = "0.8.11"
+CHEF_SERVER_API_ROOT = File.expand_path(File.dirname(__FILE__) + '/../')

data/lib/chef-server-api/version.rb

@@ -0,0 +1,3 @@
+module ChefServerApi
+  VERSION = '0.9.0.a3'
+end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: chef-server-api
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  prerelease: true
   segments: 
   - 0
-  - 8
-  - 16
-  version: 0.8.16
+  - 9
+  - 0
+  - a3
+  version: 0.9.0.a3
 platform: ruby
 authors: 
 - Opscode
@@ -14,12 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-11 00:00:00 -07:00
+date: 2010-06-04 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: merb-core
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -27,14 +27,14 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 1
+        - 1
         - 0
-        - 0
-        version: 1.0.0
+        version: 1.1.0
   type: :runtime
+  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: merb-slices
-  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -42,14 +42,14 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 1
+        - 1
         - 0
-        - 0
-        version: 1.0.0
+        version: 1.1.0
   type: :runtime
+  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: merb-assets
-  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -57,14 +57,14 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 1
+        - 1
         - 0
-        - 0
-        version: 1.0.0
+        version: 1.1.0
   type: :runtime
+  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: merb-helpers
-  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -72,15 +72,30 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 1
+        - 1
         - 0
-        - 0
-        version: 1.0.0
+        version: 1.1.0
   type: :runtime
+  prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: json
-  prerelease: false
+  name: merb-param-protection
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 1
+        - 0
+        version: 1.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: json
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - <=
@@ -91,11 +106,11 @@ dependencies:
         - 2
         version: 1.4.2
   type: :runtime
-  version_requirements: *id005
+  prerelease: false
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: uuidtools
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -106,11 +121,11 @@ dependencies:
         - 1
         version: 2.1.1
   type: :runtime
-  version_requirements: *id006
+  prerelease: false
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: thin
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -119,11 +134,12 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id007
+  prerelease: false
+  version_requirements: *id008
 description: A systems integration framework, built to bring the benefits of configuration management to your entire infrastructure.
 email: chef@opscode.com
-executables: []
-
+executables: 
+- chef-server
 extensions: []
 
 extra_rdoc_files: 
@@ -133,28 +149,24 @@ files:
 - LICENSE
 - README.rdoc
 - Rakefile
+- config/environments/development.rb
 - config/init.rb
+- config/rack.rb
 - config/router.rb
-- lib/chef-server-api/merbtasks.rb
-- lib/chef-server-api/slicetasks.rb
-- lib/chef-server-api/spectasks.rb
+- lib/chef-server-api/version.rb
 - lib/chef-server-api.rb
 - app/controllers/application.rb
 - app/controllers/clients.rb
 - app/controllers/cookbooks.rb
-- app/controllers/data.rb
+- app/controllers/data_bags.rb
 - app/controllers/data_item.rb
 - app/controllers/exceptions.rb
 - app/controllers/main.rb
 - app/controllers/nodes.rb
 - app/controllers/roles.rb
+- app/controllers/sandboxes.rb
 - app/controllers/search.rb
 - app/controllers/users.rb
-- app/helpers/application_helper.rb
-- app/helpers/exceptions_helper.rb
-- app/helpers/global_helpers.rb
-- app/helpers/nodes_helper.rb
-- app/helpers/roles_helper.rb
 - app/helpers/tarball_helper.rb
 - app/views/exceptions/bad_request.json.erb
 - app/views/exceptions/internal_server_error.html.erb
@@ -176,8 +188,7 @@ files:
 - public/stylesheets/themes/kathleene/style.css
 - public/stylesheets/themes/orange/style.css
 - public/stylesheets/themes/reidb-greenish/style.css
-- stubs/app/controllers/application.rb
-- stubs/app/controllers/main.rb
+- bin/chef-server
 has_rdoc: true
 homepage: http://wiki.opscode.com/display/chef
 licenses: []
@@ -198,15 +209,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6.1
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A systems integration framework, built to bring the benefits of configuration management to your entire infrastructure.

data/app/helpers/application_helper.rb

@@ -1,163 +0,0 @@
-module Merb
-  module ChefServerApi
-    module ApplicationHelper
-      
-      # Generate the absolute url for a slice - takes the slice's :path_prefix into account.
-      #
-      # @param slice_name<Symbol> 
-      #   The name of the slice - in identifier_sym format (underscored).
-      # @param *args<Array[Symbol,Hash]> 
-      #   There are several possibilities regarding arguments:
-      #   - when passing a Hash only, the :default route of the current 
-      #     slice will be used
-      #   - when a Symbol is passed, it's used as the route name
-      #   - a Hash with additional params can optionally be passed
-      # 
-      # @return <String> A uri based on the requested slice.
-      #
-      # @example absolute_slice_url(:awesome, :format => 'html')
-      # @example absolute_slice_url(:forum, :posts, :format => 'xml')          
-      def absolute_slice_url(slice_name, *args)
-        options  = extract_options_from_args!(args) || {}
-        protocol = options.delete(:protocol) || request.protocol
-        host     = options.delete(:host) || request.host
-
-        protocol + "://" + host + slice_url(slice_name,*args)
-      end
-      
-      # @param *segments<Array[#to_s]> Path segments to append.
-      #
-      # @return <String> 
-      #  A path relative to the public directory, with added segments.
-      def image_path(*segments)
-        public_path_for(:image, *segments)
-      end
-      
-      # @param *segments<Array[#to_s]> Path segments to append.
-      #
-      # @return <String> 
-      #  A path relative to the public directory, with added segments.
-      def javascript_path(*segments)
-        public_path_for(:javascript, *segments)
-      end
-      
-      # @param *segments<Array[#to_s]> Path segments to append.
-      #
-      # @return <String> 
-      #  A path relative to the public directory, with added segments.
-      def stylesheet_path(*segments)
-        public_path_for(:stylesheet, *segments)
-      end
-      
-      # Construct a path relative to the public directory
-      # 
-      # @param <Symbol> The type of component.
-      # @param *segments<Array[#to_s]> Path segments to append.
-      #
-      # @return <String> 
-      #  A path relative to the public directory, with added segments.
-      def public_path_for(type, *segments)
-        ::ChefServerApi.public_path_for(type, *segments)
-      end
-      
-      # Construct an app-level path.
-      # 
-      # @param <Symbol> The type of component.
-      # @param *segments<Array[#to_s]> Path segments to append.
-      #
-      # @return <String> 
-      #  A path within the host application, with added segments.
-      def app_path_for(type, *segments)
-        ::ChefServerApi.app_path_for(type, *segments)
-      end
-      
-      # Construct a slice-level path.
-      # 
-      # @param <Symbol> The type of component.
-      # @param *segments<Array[#to_s]> Path segments to append.
-      #
-      # @return <String> 
-      #  A path within the slice source (Gem), with added segments.
-      def slice_path_for(type, *segments)
-        ::ChefServerApi.slice_path_for(type, *segments)
-      end
-      
-      def build_tree(name, node, default={}, override={})
-        node = Chef::Mixin::DeepMerge.merge(default, node)
-        node = Chef::Mixin::DeepMerge.merge(node, override)
-        html = "<table id='#{name}' class='tree table'>"
-        html << "<tr><th class='first'>Attribute</th><th class='last'>Value</th></tr>"
-        count = 0
-        parent = 0
-        append_tree(name, html, node, count, parent, override)
-        html << "</table>"
-        html
-      end
-
-      def append_tree(name, html, node, count, parent, override)
-        node.sort{ |a,b| a[0] <=> b[0] }.each do |key, value|
-          to_send = Array.new
-          count += 1
-          is_parent = false
-          local_html = ""
-          local_html << "<tr id='#{name}-#{count}' class='collapsed #{name}"
-          if parent != 0
-            local_html << " child-of-#{name}-#{parent}' style='display: none;'>"
-          else
-            local_html << "'>"
-          end
-          local_html << "<td class='table-key'><span toggle='#{name}-#{count}'/>#{key}</td>"
-          case value
-          when Hash
-            is_parent = true 
-            local_html << "<td></td>"
-            p = count
-            to_send << Proc.new { append_tree(name, html, value, count, p, override) }
-          when Array
-            is_parent = true 
-            local_html << "<td></td>"
-            as_hash = {}
-            value.each_index { |i| as_hash[i] = value[i] }
-            p = count
-            to_send << Proc.new { append_tree(name, html, as_hash, count, p, override) }
-          else
-            local_html << "<td><div class='json-attr'>#{value}</div></td>"
-          end
-          local_html << "</tr>"
-          local_html.sub!(/class='collapsed/, 'class=\'collapsed parent') if is_parent
-          local_html.sub!(/<span/, "<span class='expander'") if is_parent
-          html << local_html
-          to_send.each { |s| count = s.call }
-          count += to_send.length
-        end
-        count
-      end
-
-      # Recursively build a tree of lists.
-      #def build_tree(node)
-      #  list = "<dl>"
-      #  list << "\n<!-- Beginning of Tree -->"
-      #  walk = lambda do |key,value|
-      #    case value
-      #      when Hash, Array
-      #        list << "\n<!-- Beginning of Enumerable obj -->"
-      #        list << "\n<dt>#{key}</dt>"
-      #        list << "<dd>"
-      #        list << "\t<dl>\n"
-      #        value.each(&walk)
-      #        list << "\t</dl>\n"
-      #        list << "</dd>"
-      #        list << "\n<!-- End of Enumerable obj -->"
-      #        
-      #      else
-      #        list << "\n<dt>#{key}</dt>"
-      #        list << "<dd>#{value}</dd>"
-      #    end
-      #  end
-      #  node.sort{ |a,b| a[0] <=> b[0] }.each(&walk)
-      #  list << "</dl>"
-      #end
-
-    end
-  end
-end