rails_pwnerer 0.6.102 → 0.6.103

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.6.103. Better git checkout command sequence.
+
 v0.6.102. Workaround for buggy apt-cache search output. 
 
 v0.6.101. Install MRI 1.9.2+ instead of 1.8.7+ when available.

data/README

@@ -25,12 +25,11 @@ application.
 
 Life with +rails_pwnerer+:
 
-1) Install a bootstrap version of ruby and rubygems (yes the order is correct):
-sudo apt-get -y install ruby1.9.1
+1) Install a bootstrap version of ruby and rubygems:
+sudo apt-get -y install ruby1.9.1 make
 
 2) Install +rails_pwnerer+:
-sudo gem install rails_pwnerer make
-(if it says gem not found, retry a couple of times)
+sudo gem install rails_pwnerer
 
 3) Get your server production-ready:
 sudo rpwn scaffold

data/lib/rails_pwnerer/app/vcs/git.rb

@@ -6,6 +6,7 @@ class RailsPwnerer::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 : RailsPwnerer::Config[app_name, instance_name][:app_path]) do
+      next unless File.exist?(target_dir)
       Kernel.system "git clean -d -f -x -- #{target_dir}"
       Kernel.system "git checkout -- #{target_dir}"
     end
@@ -28,6 +29,7 @@ class RailsPwnerer::App::Git
   def revert_config_changes(app_name, instance_name)
     Dir.chdir RailsPwnerer::Config[app_name, instance_name][:app_path] do
       ['config', 'Gemfile', 'Gemfile.lock'].each do |dir|
+        next unless File.exist?(target_dir)
         Kernel.system "git clean -d -f -x -- #{dir}"
         Kernel.system "git checkout -- #{dir}"
       end
@@ -79,18 +81,10 @@ class RailsPwnerer::App::Git
     
     FileUtils.rm_rf app_path
     print "Doing Git clone, please enter your password if prompted...\n"
-    system "git clone #{git_repository} #{app_path}"
+    system "git clone -b #{git_branch} -- #{git_repository} #{app_path}"
     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}"
-    end
 
     # check that we really checked out a Rails app
     return check_rails_root(app_path) ? :ok : false
   end
-end
+end

data/lib/rails_pwnerer/scaffolds/gems.rb

@@ -30,7 +30,7 @@ class RailsPwnerer::Scaffolds::Gems
     install_gems %w(highline termios)
 
     # Debug gems on production machines.
-    install_gems %w(echoe jeweler ruby-debug ruby-debug-ide)
+    install_gems %w(echoe jeweler ruby-debug ruby-debug19 ruby-debug-ide)
     
     # Determine number of CPUs and cores.
     install_gems %w(sys-cpu)

data/lib/rails_pwnerer/scaffolds/packages.rb

@@ -48,7 +48,7 @@ class RailsPwnerer::Scaffolds::Packages
             /^libcurl\d*-openssl-dev$/
         
     # needed for solr and other java-based services
-    package 'openjdk-6-jdk'
+    package /^openjdk-\d+-jdk/
     
     # useful to be able to work with compressed data
     package 'zlib-dev', /^zlib[0-9a-z]*-dev$/

data/rails_pwnerer.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "rails_pwnerer"
-  s.version = "0.6.102"
+  s.version = "0.6.103"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Victor Costan"]
-  s.date = "2011-10-12"
+  s.date = "2012-02-04"
   s.description = "Rails deployment hack."
   s.email = "victor@costan.us"
   s.executables = ["rpwn", "rpwnctl", "rpwndev"]
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Rails_pwnerer", "--main", "README"]
   s.require_paths = ["lib", "ext"]
   s.rubyforge_project = "rails-pwnage"
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "1.8.15"
   s.summary = "Rails deployment hack."
   s.test_files = ["test/base_package_test.rb"]
 

metadata

@@ -1,87 +1,69 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rails_pwnerer
-version: !ruby/object:Gem::Version 
-  hash: 203
+version: !ruby/object:Gem::Version
+  version: 0.6.103
   prerelease: 
-  segments: 
-  - 0
-  - 6
-  - 102
-  version: 0.6.102
 platform: ruby
-authors: 
+authors:
 - Victor Costan
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-12 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-02-04 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: zerg_support
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &19263240 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: echoe
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *19263240
+- !ruby/object:Gem::Dependency
+  name: echoe
+  requirement: &19262540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: fakefs
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *19262540
+- !ruby/object:Gem::Dependency
+  name: fakefs
+  requirement: &19261940 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: flexmock
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *19261940
+- !ruby/object:Gem::Dependency
+  name: flexmock
+  requirement: &19261080 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: *19261080
 description: Rails deployment hack.
 email: victor@costan.us
-executables: 
+executables:
 - rpwn
 - rpwnctl
 - rpwndev
-extensions: 
+extensions:
 - ext/rpwn_setup_notice/extconf.rb
-extra_rdoc_files: 
+extra_rdoc_files:
 - CHANGELOG
 - LICENSE
 - README
@@ -134,7 +116,7 @@ extra_rdoc_files:
 - lib/rails_pwnerer/scaffolds/sshd.rb
 - lib/rails_pwnerer/util/kill_process_set.rb
 - lib/rails_pwnerer/util/main.rb
-files: 
+files:
 - CHANGELOG
 - LICENSE
 - Manifest
@@ -195,43 +177,34 @@ files:
 - rails_pwnerer.gemspec
 homepage: http://www.costan.us/rails_pwnage
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --line-numbers
 - --inline-source
 - --title
 - Rails_pwnerer
 - --main
 - README
-require_paths: 
+require_paths:
 - lib
 - ext
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 11
-      segments: 
-      - 1
-      - 2
-      version: "1.2"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '1.2'
 requirements: []
-
 rubyforge_project: rails-pwnage
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Rails deployment hack.
-test_files: 
+test_files:
 - test/base_package_test.rb