rails_pwnerer 0.6.25 → 0.6.26

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
data/CHANGELOG CHANGED
@@ -1,3 +1,5 @@
1
+ v0.6.26. Fixed local git configuration so updates work and don't wipe logs.
2
+
1
3
  v0.6.25. Fixed impedance in frontends computations in the nginx and thin managers.
2
4
 
3
5
  v0.6.24. Implemented support for checking out from git.
@@ -6,8 +6,8 @@ class RailsPwnage::App::Git
6
6
  # remove any files not in Git in the application dir
7
7
  def cleanup_app_dir(app_name, instance_name, target_dir, app_name_is_dir = false)
8
8
  Dir.chdir(app_name_is_dir ? app_name : RailsPwnage::Config[app_name, instance_name][:app_path]) do
9
- Kernel.system "git clean -f -x -- ."
10
- Kernel.system "git checkout -- ."
9
+ Kernel.system "git clean -d -f -x -- #{target_dir}"
10
+ Kernel.system "git checkout #{target_dir}"
11
11
  end
12
12
  end
13
13
 
@@ -28,16 +28,16 @@ class RailsPwnage::App::Git
28
28
  def revert_config_changes(app_name, instance_name)
29
29
  Dir.chdir RailsPwnage::Config[app_name, instance_name][:app_path] do
30
30
  ['config'].each do |dir|
31
- Kernel.system "git clean -f -- #{dir}"
32
- Kernel.system "git checkout -- #{dir}"
31
+ Kernel.system "git clean -d -f -x -- #{dir}"
32
+ Kernel.system "git checkout #{dir}"
33
33
  end
34
34
  end
35
35
  end
36
36
 
37
37
  def git_update(app_name, instance_name)
38
38
  Dir.chdir RailsPwnage::Config[app_name, instance_name][:app_path] do
39
- print "Doing Git fetch, please enter your password if prompted...\n"
40
- Kernel.system 'git fetch origin'
39
+ print "Doing Git pull, please enter your password if prompted...\n"
40
+ Kernel.system 'git pull'
41
41
  end
42
42
  end
43
43
 
@@ -72,6 +72,9 @@ class RailsPwnage::App::Git
72
72
  FileUtils.mkpath app_path unless File.exists? app_path
73
73
  Dir.chdir app_path do
74
74
  system "git checkout -q origin/#{git_branch}"
75
+ system "git checkout -q -b #{git_branch}"
76
+ system "git config branch.#{git_branch}.remote origin"
77
+ system "git config branch.#{git_branch}.merge #{git_branch}"
75
78
  end
76
79
 
77
80
  # check that we really checked out a Rails app
@@ -2,11 +2,11 @@
2
2
 
3
3
  Gem::Specification.new do |s|
4
4
  s.name = %q{rails_pwnerer}
5
- s.version = "0.6.25"
5
+ s.version = "0.6.26"
6
6
 
7
7
  s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
8
8
  s.authors = ["Victor Costan"]
9
- s.date = %q{2009-01-02}
9
+ s.date = %q{2009-01-12}
10
10
  s.default_executable = %q{bin/rpwn}
11
11
  s.description = %q{Rails deployment tool/hack.}
12
12
  s.email = %q{victor@costan.us}
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rails_pwnerer
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.6.25
4
+ version: 0.6.26
5
5
  platform: ruby
6
6
  authors:
7
7
  - Victor Costan
@@ -9,7 +9,7 @@ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
11
 
12
- date: 2009-01-02 00:00:00 -05:00
12
+ date: 2009-01-12 00:00:00 -05:00
13
13
  default_executable: bin/rpwn
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency