conan 0.4.4 → 0.4.6

data/lib/conan/cloud/aws/provision.rb

@@ -49,7 +49,7 @@ module AWS
     
     def build_env
 
-      #we need to check the existance of ~/.fog
+      raise "Settings file at ~/.fog not found" unless File.exists?("#{ENV['HOME']}/.fog")
 
       #first key_pairs
       key_pairs = aws_config["key_pairs"]

data/lib/conan/deployment.rb

@@ -29,6 +29,15 @@ module Conan
         system %{git push -f origin tag #{dest}}
       end
 
+
+      def git_log(from, to)
+        run_locally("git log #{real_revision(from)}..#{real_revision(to)}")
+      end
+
+      def real_revision(tag)
+        source.local.query_revision(tag) { |cmd| with_env("LC_ALL", "C") { run_locally(cmd) } }
+      end
+
       def add_role(*roles)
         roles = Hash.new{ |h,k| h[k] = [] }
         server_config.each do |s, c|

data/lib/conan/deployment/git.rb

@@ -1,11 +1,31 @@
 namespace :git do
   before "deploy:update_code", "git:tag_attempted_deploy" unless deploy_via == :copy
   task :tag_attempted_deploy do
-    git_tag branch, "#{stage}.last-deploy"
+    git_tag branch, "#{stage}.#{application}.last-deploy"
+  end
+
+  before "git:tag_attempted_deploy", "git:deploy_commits"  unless deploy_via == :copy
+  task :deploy_commits do
+    logs = git_log("#{stage}.#{application}.last-successful-deploy", branch)
+    puts "the following new commits for #{application} on #{stage} revision #{real_revision(branch)} will be deployed"
+    puts logs
+  end
+
+  before "git:tag_successful_deploy", "git:deployed_commits"  unless deploy_via == :copy
+  task :deployed_commits do
+    logs = git_log("#{stage}.#{application}.last-successful-deploy", branch)
+    puts "the following new commits for #{application} on #{stage} revision #{real_revision(branch)} were deployed"
+    puts logs
   end
 
   task :tag_successful_deploy do
-    git_tag branch, "#{stage}.last-successful-deploy"
+    git_tag branch, "#{stage}.#{application}.last-successful-deploy"
   end
   after "deploy:smoke_test", "git:tag_successful_deploy" unless deploy_via == :copy
+
+  #this task exists only to migrate tags in applications
+  task :migrate_tags do
+    git_tag real_revision("#{stage}.last-deploy"), "#{stage}.#{application}.last-deploy"
+    git_tag real_revision("#{stage}.last-successful-deploy"), "#{stage}.#{application}.last-successful-deploy"
+  end
 end

data/lib/conan/template/config/autoscale.json

@@ -5,7 +5,7 @@
         "server_to_image": "app1",
         "image_id": "ORTHIS",
         "flavor_id": "c1.xlarge",
-        "instance_monitoring": true
+        "instance_monitoring": true,
         "key_name": "keyname",
         "autoscale_groups": [""],
         "security_groups": ["default"]

data/lib/conan/template/config/aws.json

@@ -137,7 +137,8 @@
          "dimensions": {
            "ec2": ["app-1"]
          }
-     }
-   }
+        }
+      }
+    }
   }
 }

data/lib/conan/version.rb

@@ -1,3 +1,3 @@
 module Conan
-  VERSION = "0.4.4"
+  VERSION = "0.4.6"
 end

metadata

@@ -1,73 +1,74 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: conan
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 4
-  - 4
-  version: 0.4.4
+version: !ruby/object:Gem::Version
+  version: 0.4.6
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Paul Battley
 - Stuart Eccles
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-03-27 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-06-08 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: json
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 6
-        - 1
+      - !ruby/object:Gem::Version
         version: 1.6.1
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: capistrano
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 11
-        - 2
-        version: 2.11.2
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.1
+- !ruby/object:Gem::Dependency
+  name: capistrano
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.12.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: fog
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.12.0
+- !ruby/object:Gem::Dependency
+  name: fog
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-description: Set up a project to enable the provision of infrastructure through AWS and the configuration of servers using Chef via Capistrano.
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Set up a project to enable the provision of infrastructure through AWS
+  and the configuration of servers using Chef via Capistrano.
+email:
 - stuart@madebymany.co.uk
-executables: 
+executables:
 - conan
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - bin/conan
 - lib/conan/capistrano.rb
 - lib/conan/cloud/aws/autoscale.rb
@@ -106,35 +107,28 @@ files:
 - lib/conan/template/deploy/chef/solo.rb
 - lib/conan/version.rb
 - README.md
-has_rdoc: true
 homepage: http://github.com/madebymany/conan
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Conan The Deployer
 test_files: []
-