rails_pwnerer 0.6.32 → 0.6.33

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.6.33. Fixed git installation when the production branch is master.
+
 v0.6.32. Fixed default instance names for DNS names with dashes.
 
 v0.6.31. Debian package installer tries to bypass proxy if necessary.

data/lib/pwnage/app/config.rb

@@ -26,7 +26,7 @@ class RailsPwnage::App::Config
     # the first internal port for the application instance
     app_db[:port0] = 0  # will be overwritten during allocation
     # the name of the database for the application instance 
-    app_db[:db_name] ||= app_name + '_' + instance_name + '_prod'
+    app_db[:db_name] ||= (app_name + '_' + instance_name + '_prod')[0...60] # avoiding mySQL breakage
     # the datbase user for the given application
     app_db[:db_user] ||= (app_name + '_' + instance_name)[0...16] # mySQL doesn't like long user names
     # the password of the database user for the given application

data/lib/pwnage/app/git.rb

@@ -72,6 +72,8 @@ class RailsPwnage::App::Git
     FileUtils.mkpath app_path unless File.exists? app_path
     Dir.chdir app_path do
       system "git checkout -q origin/#{git_branch}"
+      # NOTE: it is only safe to delete master now, we're on a remote branch
+      system "git branch -d master"
       system "git checkout -q -b #{git_branch}"
       system "git config branch.#{git_branch}.remote origin"
       system "git config branch.#{git_branch}.merge #{git_branch}"

data/rails_pwnerer.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rails_pwnerer}
-  s.version = "0.6.32"
+  s.version = "0.6.33"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Victor Costan"]
-  s.date = %q{2009-02-05}
+  s.date = %q{2009-02-06}
   s.default_executable = %q{bin/rpwn}
   s.description = %q{Rails deployment tool/hack.}
   s.email = %q{victor@costan.us}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rails_pwnerer
 version: !ruby/object:Gem::Version 
-  version: 0.6.32
+  version: 0.6.33
 platform: ruby
 authors: 
 - Victor Costan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-05 00:00:00 -05:00
+date: 2009-02-06 00:00:00 -05:00
 default_executable: bin/rpwn
 dependencies: []