remy 0.0.3 → 0.0.4

data/.rdebugrc

@@ -0,0 +1,3 @@
+set autolist
+set autoeval
+set autoreload

data/.rvmrc

@@ -1 +1 @@
-rvm 1.8.7-p352@remy --create
+rvm 1.9.2-p320@remy --create

data/README.md

@@ -164,7 +164,7 @@ This assumes that 'demo.sharespost.com' is specified in the :servers section of
 
 ### Run chef-solo on a single box:
 
-The simplest usage of Remy (Note: this only works if the Remy.configuration has already been specified, such as within
+The simplest usage of Remy (Note: this only works if the Remy::Configuration::Chef.configuration has already been specified, such as within
 a Rails application):
 
 `Remy::Chef.new(:ip_address => '123.123.123.123').run`
@@ -174,7 +174,7 @@ as an argument.
 
 Example: update your production database box:
 
-    server_config = Remy.find_server_config(:rails_env => :production, :role => :db)
+    server_config = Remy::Configuration::Chef.find_server_config(:rails_env => :production, :role => :db)
     Remy::Chef.new(server_config).run
 
 Other arguments can be passed into chef and will get applied against this node:
@@ -193,7 +193,7 @@ which will make chef-solo run in debug mode.
 
 From within your Capistrano file, you do a variety of things, such as the following:
 
-    Remy.servers.find_servers(:rails_env => :staging, :role => :app) do |server|
+    Remy::Configuration::Chef.servers.find_servers(:rails_env => :staging, :role => :app) do |server|
         Remy::Chef.new(server).run
     end
 

data/lib/remy/bootstrap.rb

@@ -7,7 +7,7 @@ module Remy
     def initialize(options = { })
       @ip_address = options[:ip_address]
       @password = options[:password]
-      options = (Remy.bootstrap || {}).merge(options).symbolize_keys
+      options = (Remy::Config::Chef.bootstrap || {}).merge(options).symbolize_keys
       @ruby_version = options[:ruby_version] || '1.8.7'
       @gems = options[:gems] || {}
       @quiet = options[:quiet] || false
@@ -24,7 +24,7 @@ module Remy
 
     def apt_get_rvm_packages
       # This list of required packages came from doing "rvm requirements"
-      remote_apt_get 'build-essential openssl libreadline6 libreadline6-dev curl git-core zlib1g zlib1g-dev libssl-dev libyaml-dev libsqlite3-0 libsqlite3-dev sqlite3 libxml2-dev libxslt-dev autoconf libc6-dev ncurses-dev automake libtool bison'
+      remote_apt_get 'build-essential openssl libreadline6 libreadline6-dev curl git-core zlib1g zlib1g-dev libssl-dev libyaml-dev libsqlite3-0 libsqlite3-dev sqlite3 libxml2-dev libxslt-dev autoconf libc6-dev ncurses-dev automake libtool bison subversion'
     end
 
     def install_gems_to_bootstrap_chef

data/lib/remy/chef.rb

@@ -3,17 +3,18 @@ module Remy
     # For chef-solo info, see: http://wiki.opscode.com/display/chef/Chef+Solo
     include ::Remy::Shell
     include FileUtils
+    include ::Remy::Utility
     attr_reader :ip_address
 
     def initialize(options = {})
       options = JSON.parse(options).symbolize_keys! if options.is_a?(String)
       @chef_args = options.delete(:chef_args)
       @quiet = options.delete(:quiet)
-      @node_configuration = Remy.configuration.dup
-      @ip_address = options[:ip_address] ? options[:ip_address] : @node_configuration.ip_address
-      server_config = Remy.find_server_config(:ip_address => ip_address) || Hashie::Mash.new
-      @node_configuration.deep_merge!(server_config)
-      @node_configuration.merge!(options)
+      @node_config = Remy::Config::Chef.config.dup
+      @ip_address = options[:ip_address] ? options[:ip_address] : @node_config.ip_address
+      server_config = Remy::Config::Chef.find_server_config(:ip_address => ip_address) || Hashie::Mash.new
+      @node_config.deep_merge!(server_config)
+      @node_config.merge!(options)
     end
 
     def run
@@ -23,7 +24,7 @@ module Remy
     end
 
     def self.rake_run(rake_options)
-      ip_addresses = Remy.determine_ip_addresses_for_remy_run(rake_options)
+      ip_addresses = Remy::Config::Chef.determine_ip_addresses_for_remy_run(rake_options)
       ip_addresses.each do |ip_address|
         Remy::Chef.new(:ip_address => ip_address).run
       end
@@ -36,7 +37,7 @@ module Remy
       copy_spec_cookbook_and_role_dirs_to_tmp_dir
       create_solo_rb
       create_bash_script_which_runs_chef
-      create_node_json_from_node_configuration
+      create_node_json_from_node_config
     end
 
     def rsync_temp_dir_with_cookbooks_to_remote_host
@@ -66,13 +67,8 @@ module Remy
     end
 
     def copy_spec_cookbook_and_role_dirs_to_tmp_dir
-      [@node_configuration.roles_path, @node_configuration.cookbook_path, @node_configuration.spec_path].each do |path|
-        if path
-          full_path = path.map{|p| File.expand_path(p) }
-          full_path.each do |a_path|
-            cp_r a_path, tmp_dir
-          end
-        end
+      flatten_paths(@node_config.roles_path, @node_config.cookbook_path, @node_config.spec_path).each do |a_path|
+        cp_r a_path, tmp_dir
       end
     end
 
@@ -102,9 +98,9 @@ EOF
       chmod(0755, File.join(tmp_dir, run_chef_solo_bash_script))
     end
 
-    def create_node_json_from_node_configuration
+    def create_node_json_from_node_config
       File.open(File.join(tmp_dir, node_json), 'w+') do |f|
-        f << @node_configuration.to_json
+        f << @node_config.to_json
       end
     end
 
@@ -117,7 +113,7 @@ EOF
     end
 
     def remote_chef_dir
-      @node_configuration.remote_chef_dir
+      @node_config.remote_chef_dir
     end
 
     def tmp_dir

data/lib/remy/config/chef.rb

@@ -0,0 +1,56 @@
+#--
+# Copyright (c) 2011 Gregory S. Woodward
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#++
+
+module Remy
+  module Config
+    class Chef
+      extend Remy::Config
+      include ::Remy::Shell
+      include FileUtils
+
+      def self.configure
+        temp_config = Hashie::Mash.new(:node_attributes => {}, :yml_files => [], :remote_chef_dir => '/var/chef')
+        yield temp_config
+        yml_files = [temp_config.yml_files].compact.flatten
+        @config = Hashie::Mash.new({:yml_files => yml_files,
+                                           :remote_chef_dir => temp_config.remote_chef_dir,
+                                           :roles_path => [temp_config.roles_path].compact.flatten,
+                                           :spec_path => [temp_config.spec_path].compact.flatten,
+                                           :cookbook_path => [temp_config.cookbook_path].compact.flatten}.merge!(temp_config.node_attributes))
+
+        yml_files.each do |filename|
+          begin
+            @config.deep_merge!(YAML.load(ERB.new(File.read(filename)).result) || {})
+          rescue SystemCallError, IOError
+            # do nothing if the chef.yml file could not be read (it's not needed for every usage of remy, just certain ones)
+          end
+        end
+      end
+
+      def self.save_node_json(output_file_path)
+        FileUtils.mkdir_p File.dirname(output_file_path)
+        File.open(output_file_path, 'w') { |f| f << @config.to_json }
+      end
+    end
+  end
+end

data/lib/remy/config/node.rb

@@ -0,0 +1,9 @@
+class Remy::Config::Node
+  extend Remy::Config
+
+  def self.configure
+    temp_config = Hashie::Mash.new
+    yield temp_config
+    @config = Hashie::Mash.new(JSON.parse(File.read(temp_config.json_file)))
+  end
+end

data/lib/remy/{remy.rb → config.rb}

@@ -22,52 +22,22 @@
 #++
 
 module Remy
-  class Configuration
-    attr_accessor :yml_files, :cookbook_path, :spec_path, :remote_chef_dir, :node_attributes, :roles_path
-
-    def initialize
-      @yml_files = []
-      @node_attributes = {}
-    end
-  end
-
-  class << self
-    include ::Remy::Shell
-    include FileUtils
-
-    def configure
-      @config_instance = Configuration.new
-      yield @config_instance
-      @configuration = Hashie::Mash.new({:yml_files => [@config_instance.yml_files].compact.flatten,
-                                 :remote_chef_dir => (@config_instance.remote_chef_dir || '/var/chef'),
-                                 :roles_path => [@config_instance.roles_path].compact.flatten,
-                                 :spec_path => [@config_instance.spec_path].compact.flatten,
-                                 :cookbook_path => [@config_instance.cookbook_path].compact.flatten}.merge!(@config_instance.node_attributes))
-
-      @config_instance.yml_files.each do |filename|
-        begin
-          configuration.deep_merge!(YAML.load(ERB.new(File.read(filename)).result) || {})
-        rescue SystemCallError, IOError
-          # do nothing if the chef.yml file could not be read (it's not needed for every usage of remy, just certain ones)
-        end
-      end
-    end
-
-    def configuration
-      @configuration ? @configuration : Hashie::Mash.new
+  module Config
+    def config
+      @config ? @config : Hashie::Mash.new
     end
 
     def to_json
-      configuration.to_json
+      config.to_json
     end
 
     def servers
-      configuration.servers
+      config.servers
     end
 
     def find_servers(options = {})
-      return nil unless configuration.servers
-      Hashie::Mash.new(configuration.servers.inject({}) do |hash, (server_name, server_config)|
+      return nil unless config.servers
+      Hashie::Mash.new(config.servers.inject({}) do |hash, (server_name, server_config)|
         found = options.all? { |(key, value)| server_config[key] == value }
         hash[server_name] = server_config if found
         hash
@@ -75,8 +45,8 @@ module Remy
     end
 
     def find_server(options = {})
-      return nil unless configuration.servers
-      server_name, server_config = configuration.servers.detect do |(server_name, server_config)|
+      return nil unless config.servers
+      server_name, server_config = config.servers.detect do |(server_name, server_config)|
         options.all? { |(key, value)| server_config[key] == value }
       end
       {server_name => server_config.nil? ? nil : server_config.dup}
@@ -87,16 +57,16 @@ module Remy
     end
 
     def find_server_config_by_name(name)
-      return nil unless configuration.servers
-      configuration.servers.find {|(server_name, _)| server_name == name}.try(:last)
+      return nil unless config.servers
+      config.servers.find { |(server_name, _)| server_name == name }.try(:last)
     end
 
-    def cloud_configuration
-      configuration && configuration.cloud_configuration
+    def cloud_config
+      config && config.cloud_config
     end
 
     def bootstrap
-      configuration && configuration.bootstrap
+      config && config.bootstrap
     end
 
     def determine_ip_addresses_for_remy_run(rake_args)
@@ -104,12 +74,12 @@ module Remy
       if options_hash = convert_properties_to_hash(rake_args)
         servers = find_servers(options_hash)
         if !servers.empty?
-          ip_addresses = servers.collect {|server_name, chef_option| chef_option.ip_address }
+          ip_addresses = servers.collect { |server_name, chef_option| chef_option.ip_address }
         else
           ip_addresses = [options_hash[:ip_address]]
         end
       else
-        names_or_ip_addresses = rake_args.present? ? rake_args.split(' ').collect {|name| name.strip } : []
+        names_or_ip_addresses = rake_args.present? ? rake_args.split(' ').collect { |name| name.strip } : []
         names_or_ip_addresses.each do |name_or_ip_address|
           # From: http://www.regular-expressions.info/examples.html
           ip_address_regex = '\b(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\b'
@@ -119,7 +89,7 @@ module Remy
             ip_addresses << server_config.ip_address
           end
         end
-        ip_addresses << configuration.ip_address
+        ip_addresses << config.ip_address
       end
       ip_addresses.compact
     end

data/lib/remy/server.rb

@@ -6,7 +6,7 @@ class Remy::Server
       :flavor_id => 4, # 2GB
       :image_id => 49, # Ubuntu 10.04 LTS (lucid)
       :quiet => false
-    }.merge(Remy.cloud_configuration || {}).merge(options || {}).symbolize_keys
+    }.merge(Remy::Config::Chef.cloud_config || {}).merge(options || {}).symbolize_keys
 
     @server_name = options[:server_name]
     @cloud_api_key = options[:cloud_api_key]

data/lib/remy/utility.rb

@@ -0,0 +1,7 @@
+module Remy
+  module Utility
+    def flatten_paths(*path_arrays)
+      path_arrays.flatten.compact.map { |path| File.expand_path(path) }
+    end
+  end
+end

data/lib/remy/version.rb

@@ -1,3 +1,3 @@
 module Remy
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/remy.rb

@@ -40,9 +40,10 @@ require 'json'
 require 'hashie'
 require 'tmpdir'
 require 'remy/shell'
+require 'remy/utility'
 require 'yaml'
 dir = File.dirname(__FILE__)
-Dir[File.join(File.dirname(__FILE__), 'remy', '**', '*.rb')].each {|f| require f.gsub(dir, '')[1, f.length] }
+Dir[File.join(dir, 'remy', '**', '*.rb')].each {|f| require f.gsub(dir, '')[1, f.length] }
 
 module Remy
   begin

data/lib/tasks/remy.rake

@@ -1,18 +1,16 @@
 require 'remy'
 
 namespace :remy do
-  task :environment do
-    begin
-      Rake::Task[:environment].invoke
-    rescue RuntimeError
-    end
+  desc 'Create a JSON file from the contents of the Chef yml config files for use on development boxes by the Rails application.'
+  task :save_node_json, :rake_args do |task, options|
+    Remy::Config::Chef.save_node_json(options[:rake_args])
   end
 
   desc 'ssh to a named box'
   task :ssh, :rake_args do |task, options|
     Rake::Task[:'remy:environment'].invoke
-    user = Remy.configuration.user || 'root'
-    if ip_address = Remy.determine_ip_addresses_for_remy_run(options[:rake_args]).try(:first)
+    user = Remy::Config::Chef.config.user || 'root'
+    if ip_address = Remy::Config::Chef.determine_ip_addresses_for_remy_run(options[:rake_args]).try(:first)
       exec "ssh #{user}@#{ip_address}"
     end
   end
@@ -20,7 +18,6 @@ namespace :remy do
   namespace :chef do
     desc 'run chef solo'
     task :run, :rake_args do |task, options|
-      Rake::Task[:'remy:environment'].invoke
       Remy::Chef.rake_run(options[:rake_args])
     end
   end
@@ -28,19 +25,16 @@ namespace :remy do
   namespace :server do
     desc 'create a server'
     task :create, :server_name, :flavor_id, :cloud_api_key, :cloud_username, :cloud_provider, :image_id do |task, options|
-      Rake::Task[:'remy:environment'].invoke
       Remy::Server.new(options).create
     end
 
     desc 'bootstrap chef'
     task :bootstrap, :ip_address, :password do |task, options|
-      Rake::Task[:'remy:environment'].invoke
       Remy::Bootstrap.new(options).run
     end
 
     desc 'create a server and bootstrap chef'
     task :create_and_bootstrap, :server_name, :flavor_id, :cloud_api_key, :cloud_username, :cloud_provider, :image_id do |task, options|
-      Rake::Task[:'remy:environment'].invoke
       begin
         result = Remy::Server.new({:raise_exception => true}.merge(options)).create
         Rake::Task[:'remy:server:bootstrap'].invoke(result[:ip_address], result[:password])

data/remy.gemspec

@@ -19,13 +19,12 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   # specify any dependencies here; for example:
-  s.add_development_dependency 'bourne'
-  s.add_development_dependency 'mocha'
   s.add_development_dependency 'i18n'
   s.add_development_dependency 'json'
   s.add_development_dependency 'rspec', '~> 2.7.0'
   s.add_runtime_dependency 'activesupport', '>= 2'
   s.add_runtime_dependency 'chef'
+  s.add_runtime_dependency 'rake'
   s.add_runtime_dependency 'fog'
   s.add_runtime_dependency 'hashie'
 end

data/spec/fixtures/chef.yml

@@ -10,7 +10,7 @@ rails_env: bogus_and_should_be_overridden_by_value_in_servers_section
 servers:
   web.sharespost.com:
     <<: *APP
-    ip_address: <%= IP_ADDRESS %>
+    ip_address: <%= IP_ADDRESS_OF_REMY_TEST %>
     rails_env: demo
     color: blue
 
@@ -27,7 +27,7 @@ servers:
     rails_env: demo
     color: green
 
-cloud_configuration:
+cloud_config:
   cloud_provider: Rackspace
   cloud_username: sharespost
   cloud_api_key: abcdefg12345
@@ -38,7 +38,7 @@ cloud_configuration:
 bootstrap:
   ruby_version: 1.9.2
   gems:
-    bundler: 1.0.21
-    chef: 0.10.4
-    rspec: 2.7.0
+    bundler: 3.0.0
+    chef: 10.12.0
+    rspec: 2.11.0
 

data/spec/fixtures/hello_world_chef.yml

@@ -1,4 +1,4 @@
-ip_address: <%= IP_ADDRESS %>
+ip_address: <%= IP_ADDRESS_OF_REMY_TEST %>
 color: blue
 recipes:
   - recipe[hello_world]

data/spec/fixtures/node.json

@@ -0,0 +1 @@
+{"blah": "bar"}

data/spec/remy/bootstrap_spec.rb

@@ -15,19 +15,19 @@ describe Remy::Bootstrap do
 
   describe "ruby_version" do
     it 'should default to 1.8.7 if there is no Ruby version specified in the yml files' do
-      Remy.configure { |config| config.yml_files = File.join(File.dirname(__FILE__), '../fixtures/hello_world_chef.yml') }
+      Remy::Config::Chef.configure { |config| config.yml_files = File.join(File.dirname(__FILE__), '../fixtures/hello_world_chef.yml') }
       bootstrap = Remy::Bootstrap.new
       ruby_version(bootstrap).should == '1.8.7'
     end
 
     it 'should get the Ruby version if specified in the yml files' do
-      Remy.configure { |config| config.yml_files = File.join(File.dirname(__FILE__), '../fixtures/chef.yml') }
+      Remy::Config::Chef.configure { |config| config.yml_files = File.join(File.dirname(__FILE__), '../fixtures/chef.yml') }
       bootstrap = Remy::Bootstrap.new
       ruby_version(bootstrap).should == '1.9.2'
     end
 
     it 'should use the version passed in as an option, even if it exists in the yml files' do
-      Remy.configure { |config| config.yml_files = File.join(File.dirname(__FILE__), '../fixtures/chef.yml') }
+      Remy::Config::Chef.configure { |config| config.yml_files = File.join(File.dirname(__FILE__), '../fixtures/chef.yml') }
       bootstrap = Remy::Bootstrap.new(:ruby_version => '1.9.1')
       ruby_version(bootstrap).should == '1.9.1'
     end
@@ -35,7 +35,7 @@ describe Remy::Bootstrap do
 
   describe "gems" do
     it 'should default to nil if not specified in the yml files' do
-      Remy.configure { |config| config.yml_files = File.join(File.dirname(__FILE__), '../fixtures/hello_world_chef.yml') }
+      Remy::Config::Chef.configure { |config| config.yml_files = File.join(File.dirname(__FILE__), '../fixtures/hello_world_chef.yml') }
       bootstrap = Remy::Bootstrap.new
       gem(bootstrap)[:chef].should be_nil
       gem(bootstrap)[:bundler].should be_nil
@@ -43,17 +43,17 @@ describe Remy::Bootstrap do
     end
 
     it 'should get gem version if it has been specified in the yml files' do
-      Remy.configure { |config| config.yml_files = File.join(File.dirname(__FILE__), '../fixtures/chef.yml') }
+      Remy::Config::Chef.configure { |config| config.yml_files = File.join(File.dirname(__FILE__), '../fixtures/chef.yml') }
       bootstrap = Remy::Bootstrap.new
-      gem(bootstrap)[:chef].should == '0.10.4'
-      gem(bootstrap)[:bundler].should == '1.0.21'
-      gem(bootstrap)[:rspec].should == '2.7.0'
+      gem(bootstrap)[:chef].should == '10.12.0'
+      gem(bootstrap)[:bundler].should == '3.0.0'
+      gem(bootstrap)[:rspec].should == '2.11.0'
     end
   end
 
   describe "ip_address" do
     it 'should use the value from the options' do
-      Remy.configure { |config| config.yml_files = File.join(File.dirname(__FILE__), '../fixtures/hello_world_chef.yml') }
+      Remy::Config::Chef.configure { |config| config.yml_files = File.join(File.dirname(__FILE__), '../fixtures/hello_world_chef.yml') }
       bootstrap = Remy::Bootstrap.new(:ip_address => '1.2.3.4', :password => 'abcdef')
       ip_address(bootstrap).should == '1.2.3.4'
     end