breeze 0.0.4 → 0.0.5

data/README.md

@@ -1,14 +1,17 @@
 # breeze
 
 Breeze provides some [Thor](https://github.com/wycats/thor) tasks and example scripts for managing cloud computing resources
-and deployments on [Amazon's AWS cloud](http://aws.amazon.com/). It uses [fog](https://github.com/geemus/fog) for the hard
-work so it should be fairly easy to add support for other cloud computing providers that are supported by fog.
+and deployments. Currently only [Amazon's AWS cloud](http://aws.amazon.com/) is supported, but breeze uses
+[fog](https://github.com/geemus/fog) for the hard work so it should be fairly easy to add support for other cloud computing
+providers that are supported by fog.
 
-Breeze implements zero downtime deployments by moving an elastic ip from one server to another. Db migrations have to be
-compatible with the previous version.
+Breeze implements zero downtime deploys and rollbacks by moving an elastic ip from one server to another. Db migrations have to be
+compatible with the previous version. http://pedro.herokuapp.com/past/2011/7/13/rails_migrations_with_no_downtime/
 
 ## install
 
+Run the following commands to install breeze and initialize a new project with configuration file templates.
+
     gem install breeze
     cd your-project
     breeze init
@@ -21,10 +24,13 @@ for more information.
 
 ## create a server image
 
+The command below installs a server and saves a private server image. When this is fully automated it can be
+repeated with new software packages or a new OS version.
+
     thor server:image:create
 
 The default install.sh compiles ruby, passenger, nginx and image magick. It takes a long time
-(maybe half an hour on a small instance). It will prompt for the image name when completed.
+(maybe half an hour on a small instance) and it will prompt for the image name when completed.
 
 ## use it
 
@@ -37,7 +43,7 @@ The default install.sh compiles ruby, passenger, nginx and image magick. It take
     thor staging:start     # Start web server and db for staging
     thor staging:stop      # Stop staging and destroy server and db
 
-Define your staging and production in the Thorfile and the same tasks become available for both name spaces.
+Define your staging and production constants in the Thorfile and the same tasks become available for both name spaces.
 These tasks call app tasks with fixed parameters.
 
 ## plumbing commands

data/breeze.gemspec

@@ -24,7 +24,7 @@ END_DESCRIPTION
   s.require_paths = ["lib"]
 
   s.add_dependency('thor')
-  s.add_dependency('fog', '>= 0.7')
+  s.add_dependency('fog')
   s.add_development_dependency "cucumber"
   s.add_development_dependency "aruba"
 end

data/features/getting_started.feature

@@ -0,0 +1,23 @@
+Feature: Getting started
+  
+  As a new user I want to quickly get an idea of how breeze works.
+  
+  Scenario: Start a new project
+    Given I have an empty working directory
+    When I run `breeze init`
+    Then a file named "Thorfile" should exist
+  
+  Scenario: Start a new server
+    Given my Thorfile contains access credentials and configuration
+    When I run `thor server:create`
+    And I run `thor describe:servers`
+    Then the output should look like:
+    """
+    === SERVER INSTANCES ===========================================================================
+    Name  Instance ID  IP Address .* Image ID                          Type      Zone        State
+                                     YOUR-PRIVATE-AMI-OR-A-PUBLIC-ONE  t1.micro  us-east-1a  running
+    """
+  
+  Scenario: Terminate a server
+    Given I have started a server
+    Then I can terminate the server with `thor server:destroy [SERVER ID] --force`

data/features/step_definitions/application_steps.rb

@@ -0,0 +1,14 @@
+Given /^I have an empty working directory$/ do
+  step "I run `rm -rf config Thorfile`"
+end
+
+Given /^my Thorfile contains access credentials and configuration$/ do
+  # the Thorfile should be okay already, just check it
+  check_file_content('Thorfile', "CONFIGURATION", true)
+end
+
+Then /^the output should look like:$/ do |lines|
+  lines.each_line do |line|
+    all_output.should match(/#{line.strip}/)
+  end
+end

data/features/step_definitions/server_steps.rb

@@ -0,0 +1,8 @@
+Given /^I have started a server$/ do
+  step "I run `thor server:create`"
+  @started_server_id = $1 if all_stdout =~ /server (i-[^.])\.\.\./
+end
+
+Then /^I can terminate the server with `thor server:destroy \[SERVER ID\] \-\-force`$/ do
+  step "I successfully run `thor server:destroy #{@started_server_id} --force`"
+end

data/features/support/env.rb

@@ -16,13 +16,17 @@ END_SCRIPT
 # and commands that make changes to the local system.
 system("rm -rf #{template_dir}/config/breeze/configs/*")
 
-# Use the current source insted of the installed gem.
+# Use the current source with bundler insted of the installed gem.
 thorfile_path = File.join(template_dir, 'Thorfile')
 thorfile_content = File.read(thorfile_path)
-expected_require = "require 'breeze'"
-wanted_require = "require 'bundler'; Bundler.setup; require 'breeze'"
-raise "Cannot find #{expected_require} in #{thorfile_path}" unless thorfile_content.include?(expected_require)
-File.open(thorfile_path, 'w') { |f| f.puts(thorfile_content.sub(expected_require, wanted_require)) }
+{ # replace thorfile content:
+  "require 'breeze'" => "require 'bundler'; Bundler.setup; require 'breeze'",
+  "'THE-NAME-OF-YOUR-KEYPAIR'" => 'nil'
+}.each do |expected, wanted|
+  raise "Cannot find #{expected} in #{thorfile_path}" unless thorfile_content.include?(expected)
+  thorfile_content.sub!(expected, wanted)
+end
+File.open(thorfile_path, 'w') { |f| f.puts(thorfile_content) }
 
 # Use Fog.mock!
 system("echo 'Fog.mock!' >> #{thorfile_path}")
@@ -30,4 +34,5 @@ system("echo 'Fog.mock!' >> #{thorfile_path}")
 # Clone the test app for each scenario.
 Before do
   system("cp -r #{template_dir} tmp/aruba")
+  @aruba_timeout_seconds = 5
 end

data/lib/breeze.rb

@@ -1,6 +1,6 @@
 module Breeze
 
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
   autoload :Veur, 'breeze/veur'
 
 end

data/lib/breeze/fog_extensions/aws.rb

@@ -1,10 +1,10 @@
-require 'fog/compute/models/aws/server'
-require 'fog/compute/models/aws/image'
+require 'fog/aws/models/compute/server'
+require 'fog/aws/models/compute/image'
 
 module Fog
 
-  module AWS
-    class Compute::Server
+  module Compute
+    class AWS::Server
 
       def name
         breeze_data['name'] || tags['Name']
@@ -54,7 +54,7 @@ module Fog
       end
 
     end
-    class Compute::Image
+    class AWS::Image
 
       def display_name
         name or location

data/lib/breeze/fog_wrapper.rb

@@ -0,0 +1,73 @@
+require 'breeze/fog_extensions'
+module Breeze
+
+  # The fog wrapper makes it possible for subsequent shell commands
+  # to share the same fog mock session. If Fog.mocking? is true, the
+  # mock data is read from and written to a yaml file.
+  module FogWrapper
+
+    def self.connection(type)
+      {:compute => Compute, :rds => RDS}[type].get_connection
+    end
+
+    def self.flush_mock_data!
+      Compute.new.flush_data!
+      # RDS.new.flush_data!
+    end
+
+    class AbstractConnectionWrapper
+
+      def self.get_connection
+        Fog.mocking? ? new : direct_fog_connection
+      end
+
+      def method_missing(*args)
+        load_data
+        return_value = fog.send(*args)
+        flush_data!
+        return_value
+      end
+
+      def flush_data!
+        File.open(data_file, 'w') { |f| YAML::dump(get_data, f) }
+      end
+
+      private
+
+      def fog
+        @fog ||= self.class.direct_fog_connection
+      end
+      def load_data
+        set_data(YAML::load_file(data_file)) if File.exists?(data_file)
+      end
+      def get_data
+        mock_class.instance_variable_get('@data')
+      end
+      def set_data(data)
+        mock_class.instance_variable_set('@data', data)
+      end
+    end
+
+    class Compute < AbstractConnectionWrapper
+      def self.direct_fog_connection
+        Fog::Compute.new(CONFIGURATION[:cloud_service])
+      end
+      private
+      def data_file  ; 'fog_compute_data.yaml' ; end
+      def mock_class ; Fog::Compute::AWS::Mock ; end
+    end
+
+    # TODO: add RDS mocks to fog so that we can start testing it
+    class RDS < AbstractConnectionWrapper
+      def self.direct_fog_connection
+        credentials = CONFIGURATION[:cloud_service].reject{ |k,v| k == :provider }
+        credentials[:region] = CONFIGURATION[:db_region]
+        Fog::AWS::RDS.new(credentials)
+      end
+      private
+      def data_file  ; 'fog_rds_data.yaml' ; end
+      def mock_class ; Fog::AWS::RDS::Mock ; end
+    end
+
+  end
+end

data/lib/breeze/tasks/server.rb

@@ -33,17 +33,19 @@ module Breeze
       server = fog.servers.create(options)
       print "Launching server #{server.id}"
       wait_until('running!') { server.running? }
+      FogWrapper.flush_mock_data! if Fog.mocking?
       return server
     end
 
     # Can take a host name or an ip address. Resolves the host name
     # and returns the ip address if get_ip is passed in as true.
     def wait_until_host_is_available(host, get_ip=false)
-      if Resolv.getaddresses(host).empty?
+      resolved_host = Resolv.getaddresses(host).first
+      if resolved_host.nil?
         print("Waiting for #{host} to resolve")
-        wait_until('ready!') { Resolv.getaddresses(host).any? }
+        wait_until('ready!') { resolved_host = Resolv.getaddresses(host).first }
       end
-      host = Resolv.getaddresses(host).first if get_ip
+      host = resolved_host if get_ip
       unless remote_is_available?(host)
         print("Waiting for #{host} to accept connections")
         wait_until('ready!') { remote_is_available?(host) }

data/lib/breeze/veur.rb

@@ -1,4 +1,4 @@
-require 'breeze/fog_extensions'
+require 'breeze/fog_wrapper'
 
 module Breeze
 
@@ -38,7 +38,14 @@ module Breeze
     #   wait_until { my_task.completed? }
     def wait_until(message='completed!')
       3.times { dot_and_sleep(1) }
-      dot_and_sleep(2) until yield
+      begin
+        dot_and_sleep(2) until yield
+      rescue Excon::Errors::SocketError => e
+        # print out the error so the user can interrupt if necessary
+        print "#{e.class}: #{e.message}! Retry:"
+        sleep(1)
+        retry
+      end
       puts message
     end
 
@@ -68,7 +75,7 @@ module Breeze
     end
 
     def fog
-      @fog ||= Fog::Compute.new(CONFIGURATION[:cloud_service])
+      @fog ||= Breeze::FogWrapper.connection(:compute)
     end
 
     def dns
@@ -76,10 +83,7 @@ module Breeze
     end
 
     def rds
-      return @rds if @rds
-      credentials = CONFIGURATION[:cloud_service].reject{ |k,v| k == :provider }
-      credentials[:region] = CONFIGURATION[:db_region]
-      @rds = Fog::AWS::RDS.new(credentials)
+      @rds ||= Breeze::FogWrapper.connection(:rds)
     end
 
   end

metadata

@@ -1,89 +1,76 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: breeze
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 4
-  version: 0.0.4
+version: !ruby/object:Gem::Version
+  version: 0.0.5
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Markus Bengts
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-19 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-01-13 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: thor
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70318976130880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: fog
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70318976130880
+- !ruby/object:Gem::Dependency
+  name: fog
+  requirement: &70318976130460 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 7
-        version: "0.7"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: cucumber
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70318976130460
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: &70318976146200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: aruba
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70318976146200
+- !ruby/object:Gem::Dependency
+  name: aruba
+  requirement: &70318976145400 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-description: |
-  Breeze makes it easy to automate server installation and configuration. It provides
+  prerelease: false
+  version_requirements: *70318976145400
+description: ! 'Breeze makes it easy to automate server installation and configuration.
+  It provides
+
   example scripts and configuration files that you can modify and keep in your revision
-  control system. Thor tasks are provided to create server images, launch server instances etc.
 
-email: 
+  control system. Thor tasks are provided to create server images, launch server instances
+  etc.
+
+'
+email:
 - markus.bengts@gmail.com
-executables: 
+executables:
 - breeze
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - LICENSE
@@ -92,10 +79,14 @@ files:
 - bin/breeze
 - breeze.gemspec
 - features/erb_conf.feature
+- features/getting_started.feature
+- features/step_definitions/application_steps.rb
+- features/step_definitions/server_steps.rb
 - features/support/env.rb
 - lib/breeze.rb
 - lib/breeze/fog_extensions.rb
 - lib/breeze/fog_extensions/aws.rb
+- lib/breeze/fog_wrapper.rb
 - lib/breeze/initializer.rb
 - lib/breeze/tasks.rb
 - lib/breeze/tasks/app.rb
@@ -125,38 +116,33 @@ files:
 - lib/templates/shared/scripts/deploy.sh
 - lib/templates/shared/scripts/install.sh
 - lib/templates/user_data.sh
-has_rdoc: true
 homepage: https://github.com/markus/breeze
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: breeze
-rubygems_version: 1.3.7
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Thor tasks to manage cloud computing resources and deployments
-test_files: 
+test_files:
 - features/erb_conf.feature
+- features/getting_started.feature
+- features/step_definitions/application_steps.rb
+- features/step_definitions/server_steps.rb
 - features/support/env.rb