auser-poolparty 1.3.1 → 1.3.2

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 1
 :major: 1
 :minor: 3
+:patch: 2

data/bin/cloud-compile

@@ -14,13 +14,18 @@ EOS
   short_desc "Configure a cloud instance"
   
   opt :inst_num, "The number of the instance to run bootstrap on", :type => :int
+  opt :generate_graph, "Generate the dependency tree graph", :type => :string, :default => nil
 
   run do |command|
     
     @loaded_clouds.each do |cld|
       
       cld.compile
-      cld.output_resources_graph('png', "graph", {"fontsize" => 30})
+      
+      if command[:generate_graph]
+        vputs "Generating dependency graph at: #{command[:generate_graph]}"
+        cld.output_resources_graph('png', command[:generate_graph], {"fontsize" => 30})
+      end
       
     end
     

data/config/jeweler.rb

@@ -23,10 +23,8 @@ end
     s.authors = ["Ari Lerner", "Michael Fairchild", "Nate Murray"]
     
     s.test_files = Dir["test/**/test_*.rb"]
-    excludes_regexp = ["lib/erlang"].one_of_regex    
 
-    s.files = (%w(Rakefile README.rdoc License.txt VERSION.yml) + 
-              Dir["{config,examples,lib,test,tasks,script,generators,bin,vendor}/**/*"]).delete_if{|f| f =~ excludes_regexp}
+    s.files = (%w(Rakefile README.rdoc License.txt VERSION.yml) + Dir["{config,examples,lib,test,tasks,script,generators,bin,vendor}/**/*"])
     
     s.files.exclude '**/*.beam'
     s.files.exclude "**/*/erl_crash.dump"

data/lib/cloud_providers/cloud_provider_instance.rb

@@ -42,7 +42,8 @@ module CloudProviders
       # CLOUD PROVIDER METHODS
       
       # Bootstrap self.  Bootstrap runs as root, even if user is set
-      def bootstrap!(opts={})        
+      def bootstrap!(opts={})
+        callback :before_bootstrap
          if !bootstrapped? || opts[:force]
            old_user = user
            @user = "root"
@@ -56,11 +57,14 @@ module CloudProviders
           @user = old_user
           output.chomp if output
         end
+        callback :after_bootstrap
       end
       
       # Configure the node
       def configure!(opts={})
+        ddputs("Configuring: #{self.name}")
         bootstrap! unless bootstrapped?
+        callback :before_configure
         raise StandardError.new("You must pass in a cloud to configure an instance") unless cloud
         cloud.compile(self)
         scp(:source       => keypair.full_filepath, 
@@ -73,6 +77,7 @@ module CloudProviders
         rsync(:source => cloud.tmp_path/"*", :destination => "/")
         run("chmod +x /etc/poolparty/#{File.basename(script_file)}; /bin/sh /etc/poolparty/#{File.basename(script_file)}").chomp
         run(cloud.dependency_resolver.compile_command)
+        callback :after_configure
       end
       
       # Terminate self
@@ -215,6 +220,11 @@ module CloudProviders
       # Callbacks
       def loaded
       end
+            
+      def on_all_callbacks(call_time, *args, &block)
+        cloud.callback call_time
+        super
+      end
       
       def before_bootstrap
       end

data/lib/dependency_resolvers/chef/resources/chef_recipe.rb

@@ -0,0 +1,51 @@
+=begin rdoc
+== ChefRecipeFile
+
+Allows for a chef recipe to be included in the PoolParty output
+
+== Usage
+
+  has_chef_recipe "full_path_to_attributes_file"
+
+== Options
+
+* <tt>file</tt> The directory of the recipe
+
+== Examples
+
+  has_chef_recipe PoolParty.lib_dir/"vendor"/"chef"/"apache2"/"attributes"/"apache.rb"
+=end
+module PoolParty
+  module Resources
+    
+    class ChefRecipe < Resource
+      
+      default_options(
+        :file    => nil
+      )
+      
+      def valid?
+        f = (file || name)
+        raise PoolPartyError.create("ChefAttributesFileError", "You must specify a file that exists for a chef_attributes_file: #{f}") unless File.directory?(full_path)
+      end
+      
+      def path
+        @path ||= file || name
+      end
+      
+      def full_path
+        File.expand_path(path)
+      end
+      
+      def basename
+        File.basename(name)
+      end
+      
+      def print_to_chef
+        "recipe \"#{basename}\""
+      end
+      
+    end
+    
+  end
+end

data/lib/dependency_resolvers/chef.rb

@@ -6,10 +6,11 @@ module DependencyResolvers
   class Chef < Base
     
     class << self
-      attr_reader :cookbook_directory
+      attr_reader :cookbook_directory, :base_cookbook_directory
       
       def before_compile
         @cookbook_directory = compile_directory/"cookbooks"/"poolparty"
+        @base_cookbook_directory = compile_directory/"cookbooks"
         raise PoolParty::PoolPartyError.create("ChefCompileError", "No compile_directory is specified. Please specify one.") unless compile_directory
         FileUtils.mkdir_p cookbook_directory unless ::File.directory?(cookbook_directory)
       end
@@ -49,6 +50,9 @@ module DependencyResolvers
         when PoolParty::Resources::ChefAttributesFile
           attribute_files << res
           ""
+        when PoolParty::Resources::ChefRecipe
+          recipes << res
+          super
         else
           super
         end
@@ -59,13 +63,14 @@ module DependencyResolvers
       default_attr_reader :variables, []
       default_attr_reader :files, []
       default_attr_reader :attribute_files, []
+      default_attr_reader :recipes, []
       
       def require_chef_only_resources
         # Require the chef-only resources
         $:.unshift("#{File.dirname(__FILE__)}/chef")
         
         to_define_resoures = []
-        %w( http_request remote_directory remote_file route script chef_attributes_file).each do |res|
+        %w( http_request remote_directory remote_file route script chef_attributes_file chef_recipe).each do |res|
           require "resources/#{res}"
           PoolParty::Resource.define_resource("PoolParty::Resources::#{res.classify}".constantize)
         end
@@ -190,10 +195,14 @@ module DependencyResolvers
       end
       
       # compile the recipes
-      # TODO
       def compile_recipes
+        recipes.each do |recipe|
+          ddputs("[Chef recipe] Copying #{recipe.full_path} into the chef directory: #{base_cookbook_directory}")
+          FileUtils.cp_r recipe.full_path, base_cookbook_directory
+        end
       end
       
+      # Write the dna.json out
       def write_dna_json
         File.open(compile_directory/"dna.json", "w") do |f|
           f << JSON.generate({:recipes => ["poolparty"]})

data/lib/mixins/callbacks.rb

@@ -4,7 +4,7 @@ module Callbacks
       @additional_callbacks ||= arr
     end
     def callback_block(&block)
-      @callback_block ||= (block ? block : nil)
+      @callback_block ||= block
     end
   end
   
@@ -18,7 +18,7 @@ module Callbacks
     # The method (before/after_bootstrap/configure) is called
     # on self if the callback method is defined on self
     def callback(call_time, *args, &block)
-      self.class.callback_block.call(self, call_time) if self.class.callback_block
+      on_all_callbacks(call_time, *args, &block)
       callback_on_self(call_time, *args, &block)
     end
     
@@ -26,6 +26,10 @@ module Callbacks
       @callbacks ||= []
     end
     
+    def on_all_callbacks(call_time, *args, &block)
+      self.class.callback_block.call(self, call_time) if self.class.callback_block
+    end
+    
     private
     
     # TODO: Add docs

data/lib/poolparty/plugins/apache2/passenger_site.rb

@@ -11,7 +11,7 @@ module PoolParty
         :appended_path  => nil,
         :owner          => 'www-data', 
         :mode           =>'0744',
-        :enviornment    => 'production',
+        :environment    => 'production',
         :deploy_dirs    => false
       )
       
@@ -47,7 +47,7 @@ module PoolParty
   <VirtualHost *:#{port}>
       ServerName #{name}
       DocumentRoot #{site_directory}/public
-      RailsEnv #{enviornment}
+      RailsEnv #{environment}
       ErrorLog #{log_dir}/error_log
       CustomLog #{log_dir}/access_log common
   </VirtualHost>

data/test/fixtures/chef/recipes/sudo/attributes/sudoers.rb

@@ -0,0 +1,30 @@
+#
+# Cookbook Name:: sudo
+# Attribute File:: sudoers
+#
+# Copyright 2008, OpsCode, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+authorization Mash.new unless attribute?("authorization")
+
+authorization[:sudo] = Mash.new unless authorization.has_key?(:sudo)
+
+unless authorization[:sudo].has_key?(:groups)
+  authorization[:sudo][:groups] = Array.new 
+end
+
+unless authorization[:sudo].has_key?(:users)
+  authorization[:sudo][:users] = Array.new
+end

data/test/fixtures/chef/recipes/sudo/recipes/default.rb

@@ -0,0 +1,33 @@
+#
+# Cookbook Name:: sudo
+# Recipe:: default
+#
+# Copyright 2008, OpsCode, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+package "sudo" do
+  action :upgrade
+end
+
+template "/etc/sudoers" do
+  source "sudoers.erb"
+  mode 0440
+  owner "root"
+  group "root"
+  variables(
+    :sudoers_groups => node[:authorization][:sudo][:groups], 
+    :sudoers_users => node[:authorization][:sudo][:users]
+  )
+end

data/test/fixtures/chef/recipes/sudo/templates/default/sudoers.erb

@@ -0,0 +1,22 @@
+#
+# /etc/sudoers
+# 
+# Generated by Chef for <%= @node[:fqdn] %>
+# 
+
+Defaults        !lecture,tty_tickets,!fqdn
+
+# User privilege specification
+root    			ALL=(ALL) ALL
+
+<% @sudoers_users.each do |user| -%>
+<%= user %> ALL=(ALL) ALL
+<% end -%>
+
+# Members of the sysadmin group may gain root privileges
+%sysadmin 		ALL=(ALL) ALL
+
+<% @sudoers_groups.each do |group| -%>
+# Members of the group '<%= group %>' may gain root privileges
+%<%= group %> ALL=(ALL) ALL
+<% end -%>

data/test/lib/dependency_resolvers/chef/resources/chef_recipe_test.rb

@@ -0,0 +1,21 @@
+require "#{File.dirname(__FILE__)}/../../../../test_helper"
+
+include_fixture_resources
+include_chef_only_resources
+
+class ChefRecipeTest < Test::Unit::TestCase
+  context "Base" do
+    setup do
+      PoolParty::Resource.define_resource_methods
+      @res = PoolParty::Resources::ChefRecipe.new fixtures_dir/"chef"/"recipes"/"sudo"
+      @base = DependencyResolvers::Chef
+      @base.compile_directory = test_dir
+    end
+    
+    should "have the method denoted by has_method_name for http_request" do
+      assert_equal "recipe \"sudo\"", @base.compile(@res)
+    end
+    
+  end
+  
+end

data/test/lib/dependency_resolvers/chef_test.rb

@@ -17,7 +17,8 @@ class ChefTest < Test::Unit::TestCase
         :files => Resources::FileResource.new(:name => "/etc/motd", :content => "Welcome to a fake file"),
         :directories => Resources::Directory.new("/etc/poolparty"),
         :http_request => PoolParty::Resources::HttpRequest.new("posting data", :url => "http://check.in", :message => {:some => "data"}, :action => :post),
-        :link => PoolParty::Resources::Link.new("/tmp/passwd", :to => "/etc/passwd")
+        :link => PoolParty::Resources::Link.new("/tmp/passwd", :to => "/etc/passwd"),
+        :chef_recipe => PoolParty::Resources::ChefRecipe.new(fixtures_dir/"chef"/"recipes"/"sudo")
       }
     end
     
@@ -52,6 +53,12 @@ class ChefTest < Test::Unit::TestCase
       assert_equal "template \"/etc/motd\" do\n  source \"/etc/motd.erb\"\n  action :create\n  backup 5\n  mode 0644\n  owner \"root\"\nend\n", open(@cookboox_directory/"recipes"/"default.rb").read
     end
     
+    should "compile the recipes" do
+      @base.compile_to(@resources[:chef_recipe], test_dir)
+      assert_equal open(fixtures_dir/"chef"/"recipes"/"sudo"/"recipes"/"default.rb").read, open(@cookboox_directory/".."/"sudo"/"recipes"/"default.rb").read
+      assert_equal "recipe \"sudo\"", open(@cookboox_directory/"recipes"/"default.rb").read
+    end
+    
     should "compile all the resources when passed the entire array" do
       resources = []
       resources << @resources[:files]

data/vendor/gems/thrift/CHANGELOG

@@ -0,0 +1 @@
+v0.0.1. Initial release

data/vendor/gems/thrift/Makefile.am

@@ -17,12 +17,31 @@
 # under the License.
 #
 
-ACLOCAL_AMFLAGS = -I ./aclocal
+EXTRA_DIST = \
+	CHANGELOG \
+	Rakefile \
+	Manifest \
+	setup.rb \
+	lib \
+	ext \
+	benchmark \
+	script \
+	spec
 
-SUBDIRS = compiler/cpp lib test
+all-local:
+	$(RUBY) setup.rb config
+	$(RUBY) setup.rb setup
 
-dist-hook:
-	find $(distdir) -name '.[a-zA-Z0-9]*' | xargs rm -rf
+install-exec-hook:
+	$(RUBY) setup.rb install
+
+# Make sure this doesn't fail if Ruby is not configured.
+clean-local:
+	RUBY=$(RUBY) ; if test -z "$$RUBY" ; then RUBY=: ; fi ; \
+	$$RUBY setup.rb clean
+
+check-local: all
+if HAVE_RSPEC
+	rake spec
+endif
 
-EXTRA_DIST = bootstrap.sh cleanup.sh print_version.sh doc tutorial contrib \
-             CONTRIBUTORS LICENSE CHANGES DISCLAIMER NOTICE

data/vendor/gems/thrift/Manifest

@@ -0,0 +1,81 @@
+CHANGELOG
+Manifest
+Rakefile
+README
+setup.rb
+benchmark/benchmark.rb
+benchmark/Benchmark.thrift
+benchmark/client.rb
+benchmark/server.rb
+benchmark/thin_server.rb
+ext/binary_protocol_accelerated.c
+ext/binary_protocol_accelerated.h
+ext/compact_protocol.c
+ext/compact_protocol.h
+ext/constants.h
+ext/extconf.rb
+ext/macros.h
+ext/memory_buffer.c
+ext/memory_buffer.h
+ext/protocol.c
+ext/protocol.h
+ext/struct.c
+ext/struct.h
+ext/thrift_native.c
+lib/thrift.rb
+lib/thrift/client.rb
+lib/thrift/core_ext.rb
+lib/thrift/exceptions.rb
+lib/thrift/processor.rb
+lib/thrift/struct.rb
+lib/thrift/thrift_native.rb
+lib/thrift/types.rb
+lib/thrift/core_ext/fixnum.rb
+lib/thrift/protocol/base_protocol.rb
+lib/thrift/protocol/binary_protocol.rb
+lib/thrift/protocol/binary_protocol_accelerated.rb
+lib/thrift/protocol/compact_protocol.rb
+lib/thrift/serializer/deserializer.rb
+lib/thrift/serializer/serializer.rb
+lib/thrift/server/base_server.rb
+lib/thrift/server/mongrel_http_server.rb
+lib/thrift/server/nonblocking_server.rb
+lib/thrift/server/simple_server.rb
+lib/thrift/server/thread_pool_server.rb
+lib/thrift/server/threaded_server.rb
+lib/thrift/transport/base_server_transport.rb
+lib/thrift/transport/base_transport.rb
+lib/thrift/transport/buffered_transport.rb
+lib/thrift/transport/framed_transport.rb
+lib/thrift/transport/http_client_transport.rb
+lib/thrift/transport/io_stream_transport.rb
+lib/thrift/transport/memory_buffer_transport.rb
+lib/thrift/transport/server_socket.rb
+lib/thrift/transport/socket.rb
+lib/thrift/transport/unix_server_socket.rb
+lib/thrift/transport/unix_socket.rb
+script/proto_benchmark.rb
+script/read_struct.rb
+script/write_struct.rb
+spec/base_protocol_spec.rb
+spec/base_transport_spec.rb
+spec/binary_protocol_accelerated_spec.rb
+spec/binary_protocol_spec.rb
+spec/binary_protocol_spec_shared.rb
+spec/client_spec.rb
+spec/compact_protocol_spec.rb
+spec/exception_spec.rb
+spec/http_client_spec.rb
+spec/mongrel_http_server_spec.rb
+spec/nonblocking_server_spec.rb
+spec/processor_spec.rb
+spec/serializer_spec.rb
+spec/server_socket_spec.rb
+spec/server_spec.rb
+spec/socket_spec.rb
+spec/socket_spec_shared.rb
+spec/spec_helper.rb
+spec/struct_spec.rb
+spec/ThriftSpec.thrift
+spec/types_spec.rb
+spec/unix_socket_spec.rb

data/vendor/gems/thrift/README

@@ -1,9 +1,7 @@
-Apache Thrift (an Apache Incubator project)
+Thrift Ruby Software Library
+    http://incubator.apache.org/thrift/
 
-Last Modified: 2009-Jan-30
-
-License
-=======
+== LICENSE:
 
 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements. See the NOTICE file
@@ -22,116 +20,24 @@ KIND, either express or implied. See the License for the
 specific language governing permissions and limitations
 under the License.
 
-Introduction
-============
-
-Thrift is a lightweight, language-independent software stack with an
-associated code generation mechanism for RPC. Thrift provides clean
-abstractions for data transport, data serialization, and application
-level processing. The code generation system takes a simple definition
-language as its input and generates code across programming languages that
-uses the abstracted stack to build interoperable RPC clients and servers.
-
-Thrift is specifically designed to support non-atomic version changes
-across client and server code.
-
-For more details on Thrift's design and implementation, take a gander at
-the Thrift whitepaper included in this distribution or at the README files
-in your particular subdirectory of interest.
-
-Heirarchy
-=========
-
-thrift/
-
-  compiler/
-    Contains the Thrift compiler, implemented in C++.
-
-  lib/
-    Contains the Thrift software library implementation, subdivided by
-    language of implementation.
-
-    cpp/
-    java/
-    php/
-    py/
-    rb/
-
-  test/
-
-    Contains sample Thrift files and test code across the target programming
-    languages.
-
-  tutorial/
-
-    Contains a basic tutorial that will teach you how to develop software
-    using Thrift.
-
-Requirements
-============
-
-See http://wiki.apache.org/thrift/ThriftRequirements for
-an up-to-date list of build requirements.
-
-Resources
-=========
-
-More information about Thrift can be obtained on the Thrift webpage at:
-
-     http://incubator.apache.org/thrift
-
-Acknowledgments
-===============
-
-Thrift was inspired by pillar, a lightweight RPC tool written by Adam D'Angelo,
-and also by Google's protocol buffers.
-
-Installation
-============
-
-If you are building from the first time out of the source repository, you will
-need to generate the configure scripts.  (This is not necessary if you
-downloaded a tarball.)  From the top directory, do:
-
-	./bootstrap.sh
-
-Once the configure scripts are generated, thrift can be configured.
-From the top directory, do:
-
-	./configure
-
-You may need to specify the location of the boost files explicitly.
-If you installed boost in /usr/local, you would run configure as follows:
-
-	./configure --with-boost=/usr/local
-
-Note that by default the thrift C++ library is typically built with debugging
-symbols included. If you want to customize these options you should use the
-CXXFLAGS option in configure, as such:
-
-        ./configure CXXFLAGS='-g -O2'
-        ./configure CFLAGS='-g -O2'
-        ./configure CPPFLAGS='-DDEBUG_MY_FEATURE'
-
-Run ./configure --help to see other configuration options
+== DESCRIPTION:
 
-Please be aware that the Python library will ignore the --prefix option
-and just install wherever Python's distutils puts it (usually along
-the lines of /usr/lib/pythonX.Y/site-packages/).  If you need to control
-where the Python modules are installed, set the PY_PREFIX variable.
-(DESTDIR is respected for Python and C++.)
+Thrift is a strongly-typed language-agnostic RPC system.
+This library is the ruby implementation for both clients and servers.
 
-Make thrift:
+== INSTALL:
 
-	make
+  $ gem install thrift
 
-From the top directory, become superuser and do:
+== CAVEATS:
 
-	make install
+This library provides the client and server implementations of thrift.
+It does <em>not</em> provide the compiler for the .thrift files. To compile
+.thrift files into language-specific implementations, please download the full
+thrift software package.
 
-Note that some language packages must be installed manually using build tools
-better suited to those languages (at the time of this writing, this applies
-to Java, Ruby, PHP).
+== USAGE:
 
-Look for the README file in the lib/<language>/ folder for more details on the
-installation of each language library package.
+This section should get written by someone with the time and inclination.
+In the meantime, look at existing code, such as the benchmark or the tutorial
+in the full thrift distribution.