conan 0.4.9 → 0.4.10

data/lib/conan/deployment.rb

@@ -31,7 +31,13 @@ module Conan
 
 
       def git_log(from, to)
-        run_locally("git log #{real_revision(from)}..#{real_revision(to)}")
+       begin  
+          run_locally("git log #{real_revision(from)}..#{real_revision(to)}")
+       rescue RuntimeError
+          #runtime error probably means there is no initial tag and no deploys have been done
+          return run_locally("git log #{real_revision(to)}")
+       end
+
       end
 
       def real_revision(tag)

data/lib/conan/initializer.rb

@@ -1,6 +1,4 @@
 require "fileutils"
-require "rubygems"
-require "bundler/setup"
 
 module Conan
   class Initializer

data/lib/conan/template/config/deploy.rb

@@ -29,7 +29,7 @@ when :staging
   set :branch, "master"
 when :production
   set :stage,  "production"
-  set :branch, "staging.last-successful-deploy"
+  set :branch, "staging.#{application}.last-successful-deploy"
 end
 
 # You probably don't need to edit these
@@ -50,4 +50,13 @@ unless Conan::VERSION == "{{VERSION}}"
   $stderr.puts "Warning: Conan version mismatch."
 end
 
+# Edit your ~/.fog file so it contains:
+#
+# {{APPLICATION}}:
+#   :aws_access_key_id: ...
+#   :aws_secret_access_key: ...
+#
+require 'fog'
+Fog.credential = application.to_sym
+
 require "conan/capistrano"

data/lib/conan/version.rb

@@ -1,3 +1,3 @@
 module Conan
-  VERSION = "0.4.9"
+  VERSION = "0.4.10"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conan
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.4.10
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-15 00:00:00.000000000 Z
+date: 2012-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json