rails_pwnerer 0.7.7 → 0.7.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0f91e3ad61cb19dd6f961d89b72682317f1fff0
-  data.tar.gz: 4efc0bd59642eefa8829f55a74780d5c91f0a6d3
+  metadata.gz: e1f0cd29fb1eb5f727cb6409ec0c3d9e1a65f935
+  data.tar.gz: 53cde3da02d62f06a83ed8f716da31ee1aaef194
 SHA512:
-  metadata.gz: a09169d7fd3559d8016de54a219e5ce59f76736fdf7c135889554d50beea868b8f37e376f5d017aa35e9a914017aa95aeb1b28142edd6e6c10562656f106273a
-  data.tar.gz: d27dfc145b3348be934f52810bed79c53114026c3027c84e69e3ec63a5aaeda067cb3f68d2b7672f805cf401a78941b63a3c546304f9e51ed4218a00189fa3e7
+  metadata.gz: c305a04efc54da5cc92daba5b430a2c1f4a2d49cc77bf7c833d1b688cf32db7039f18539ad0f4f4dc18ea2d567d340c78adaa0dcfbb6f274f1e2e86e4d484128
+  data.tar.gz: 7671aa1fa6936d86eefa14ab5a9e2883bd477cd52fd96fe2f26feb504a27d0b7a91e3a4f715cca024bfe465491b1985a98aca89e909bfb6047b9690b585879d1

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.7.8. Fix Ruby 2.0 install, remove more hacks.
+
 v0.7.7. Remove support for Ruby 1.8 and hacks for old distributions.
 
 v0.7.6. nginx configuration fix for redirections on non-standard ports.

data/lib/rails_pwnerer/base/gems.rb

@@ -6,12 +6,12 @@ module RailsPwnerer::Base
   def install_gem(gem_name)
     system "gem install #{gem_name}"
   end
-  
+
   def upgrade_gem(gem_name)
-    system "gem update #{gem_name.nil ? '' : gem_name}" 
+    system "gem update #{gem_name.nil ? '' : gem_name}"
   end
-  
-  # update the metadata for all the gems 
+
+  # update the metadata for all the gems
   def update_gems()
     system "gem update --system"
   end
@@ -26,35 +26,20 @@ module RailsPwnerer::Base
       return false
     end
   end
-  
+
   # locates the main file in a gem (used to locate the gem)
-  def path_to_gem(gem_name, discard_suffix = '')
+  def path_to_gemdir (gem_name, discard_suffix = '')
     # TODO: use the rubygems API instead of this hack
-    
-    # method 1: peek inside rubygems' treasure chest
-    begin
-      gem_pattern = (File.join `gem environment gemdir`.strip, 'gems', gem_name) + '-'
-      gem_path = Dir.glob(gem_pattern + '*').max
-    rescue
-      gem_path = nil
-    end    
-    return gem_path unless gem_path.nil? or gem_path.empty?
-    
-    # method 2: look for the main file in the gem
-    gem_path = `gem which '#{gem_name}'`.strip
-    # discard the given suffix
-    if gem_path[-(discard_suffix.length)..-1] == discard_suffix
-      gem_path[-(discard_suffix.length)..-1] = ''
-    end
-    return gem_path
+
+    `gem environment gemdir`.strip
   end
 end
 
-module RailsPwnerer::Base  
+module RailsPwnerer::Base
   def install_gems(gem_names)
     unroll_collection(gem_names) { |n| install_gem(n) }
   end
-  
+
   def upgrade_gems(gem_names)
     unroll_collection(gem_names) { |n| upgrade_gem(n) }
   end

data/lib/rails_pwnerer/scaffolds/packages.rb

@@ -95,7 +95,8 @@ class RailsPwnerer::Scaffolds::Packages
       end
       return return_value
     end
-    package 'ruby2.0', 'ruby2.0-dev'
+    package 'ruby2.0'
+    package 'ruby2.0-dev'
     true
   end
 
@@ -115,7 +116,8 @@ class RailsPwnerer::Scaffolds::Packages
       return return_value
     end
 
-    package 'ruby1.9.1', 'ruby1.9.1-dev'
+    package 'ruby1.9.1'
+    package 'ruby1.9.1-dev'
     true
   end
 

data/lib/rails_pwnerer/scaffolds/rubygems.rb

@@ -64,7 +64,7 @@ class RailsPwnerer::Scaffolds::RubyGems
     configure_rubygems
 
     # remove the gems that are trailing behind
-    new_gems = File.dirname(File.dirname(path_to_gem('sources', '/lib/sources.rb')))
+    new_gems = path_to_gemdir
     return if new_gems == old_gems # don't wipe the new dir by mistake
     FileUtils.rm_r old_gems
   end
@@ -72,7 +72,7 @@ class RailsPwnerer::Scaffolds::RubyGems
   def preflight
     # save old lib path, in case we need to wipe it
     # we need to do this because setting up packages might wipe Ubuntu's gems
-    @@old_gems = File.dirname(File.dirname(path_to_gem('sources', '/lib/sources.rb')))
+    @@old_gems = path_to_gemdir
   end
 
   # called before packages get installed

data/rails_pwnerer.gemspec

@@ -1,9 +1,9 @@
 # -*- encoding: utf-8 -*-
-# stub: rails_pwnerer 0.7.7 ruby lib
+# stub: rails_pwnerer 0.7.8 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "rails_pwnerer"
-  s.version = "0.7.7"
+  s.version = "0.7.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Victor Costan"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_pwnerer
 version: !ruby/object:Gem::Version
-  version: 0.7.7
+  version: 0.7.8
 platform: ruby
 authors:
 - Victor Costan