rails_pwnerer 0.6.25 → 0.6.26

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.6.26. Fixed local git configuration so updates work and don't wipe logs.
+
 v0.6.25. Fixed impedance in frontends computations in the nginx and thin managers.
 
 v0.6.24. Implemented support for checking out from git.

data/lib/pwnage/app/git.rb

@@ -6,8 +6,8 @@ class RailsPwnage::App::Git
   # remove any files not in Git in the application dir
   def cleanup_app_dir(app_name, instance_name, target_dir, app_name_is_dir = false)
     Dir.chdir(app_name_is_dir ? app_name : RailsPwnage::Config[app_name, instance_name][:app_path]) do
-      Kernel.system "git clean -f -x -- ."
-      Kernel.system "git checkout -- ."
+      Kernel.system "git clean -d -f -x -- #{target_dir}"
+      Kernel.system "git checkout #{target_dir}"
     end
   end
   
@@ -28,16 +28,16 @@ class RailsPwnage::App::Git
   def revert_config_changes(app_name, instance_name)
     Dir.chdir RailsPwnage::Config[app_name, instance_name][:app_path] do
       ['config'].each do |dir|
-        Kernel.system "git clean -f -- #{dir}"
-        Kernel.system "git checkout -- #{dir}"
+        Kernel.system "git clean -d -f -x -- #{dir}"
+        Kernel.system "git checkout #{dir}"
       end
     end
   end
   
   def git_update(app_name, instance_name)
     Dir.chdir RailsPwnage::Config[app_name, instance_name][:app_path] do
-      print "Doing Git fetch, please enter your password if prompted...\n"
-      Kernel.system 'git fetch origin'
+      print "Doing Git pull, please enter your password if prompted...\n"
+      Kernel.system 'git pull'
     end
   end
   
@@ -72,6 +72,9 @@ 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}"
+      system "git checkout -q -b #{git_branch}"
+      system "git config branch.#{git_branch}.remote origin"
+      system "git config branch.#{git_branch}.merge #{git_branch}"
     end
 
     # check that we really checked out a Rails app

data/rails_pwnerer.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rails_pwnerer}
-  s.version = "0.6.25"
+  s.version = "0.6.26"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Victor Costan"]
-  s.date = %q{2009-01-02}
+  s.date = %q{2009-01-12}
   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.25
+  version: 0.6.26
 platform: ruby
 authors: 
 - Victor Costan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-02 00:00:00 -05:00
+date: 2009-01-12 00:00:00 -05:00
 default_executable: bin/rpwn
 dependencies: 
 - !ruby/object:Gem::Dependency