lib/rodeo_clown.rb in rodeo_clown-0.0.1 vs lib/rodeo_clown.rb in rodeo_clown-0.1.0

@@ -1,28 +1,47 @@
 require_relative "rodeo_clown/version"
 require "aws-sdk"
 
 module RodeoClown
 
+  def self.configs(env = ENV["RACK_ENV"] || "development")
+    @configs ||= 
+      if File.exists?(file = File.expand_path(".") + "/.rodeo_clown.yml")
+        YAML.load_file(file)
+      elsif File.exists?(file = File.expand_path("~") + "/.rodeo_clown.yml")
+        YAML.load_file(file)
+      else
+        {}
+      end[env]
+  end
   # 
   # Set aws credentials as environment variables
   # Set aws credentials in the ~/.rodeo_clown.yml
   #
   # Just set your aws credentials
   def self.credentials
     @credentials ||= 
       if ENV.key?("AWS_ACCESS_KEY") && ENV.key?("AWS_SECRET_ACCESS_KEY") 
         { access_key_id: ENV["AWS_ACCESS_KEY"],
           secret_access_key: ENV["AWS_SECRET_ACCESS_KEY"], }
-      elsif File.exists?(file = File.expand_path("~") + "/.rodeo_clown.yml")
-        YAML.load_file(file)
+      elsif configs.key?("access_key_id") && configs.key?("secret_access_key")
+        { access_key_id: configs["access_key_id"],
+           secret_access_key: configs["secret_access_key"],}
       else
         raise "Please supply aws_access_key and Aws_secret_access_key"
       end
   end
 end
 
 AWS.config RodeoClown.credentials # Street cred
 
-require_relative "rodeo_clown/ec2"
+require_relative "rodeo_clown/ext/array"
+require_relative "rodeo_clown/ext/hash"
+require_relative "rodeo_clown/is_port_open"
+require_relative "rodeo_clown/deploy"
+require_relative "rodeo_clown/deploy_strategy"
 require_relative "rodeo_clown/elb"
-require_relative "rodeo_clown/ext/instance_collection.rb"
+require_relative "rodeo_clown/ext/aws/ec2/instance_collection"
+require_relative "rodeo_clown/ext/aws/ec2/instance"
+require_relative "rodeo_clown/instance_builder"
+require_relative "rodeo_clown/ext/aws/elb/instance_collection"
+require_relative "rodeo_clown/ec2"