devstructure 0.5.3 → 0.5.4

data/lib/devstructure/api.rb

@@ -4,13 +4,7 @@
 require 'devstructure'
 require 'devstructure/blueprint'
 
-# *HERE BE DRAGONS* The 1.4.3 version of the JSON gem is crap-tastic,
-# which forces me to pin to 1.4.2, which in turn forces me to load
-# RubyGems manually here, which in turn pretty much makes me cry.
-require 'rubygems'
-gem 'json', '= 1.4.2'
 require 'json'
-
 require 'net/http'
 require 'net/https'
 require 'openssl'

data/lib/devstructure/blueprint.rb

@@ -124,7 +124,6 @@ class DevStructure::Blueprint < Hash
         when /^rubygems(\d+\.\d+(?:\.\d+)?)$/
           b.packages["apt"]["_packages"]["ruby#{$1}-dev"] =
             packages["apt"]["_packages"]["ruby#{$1}-dev"]
-
         end
       }
     )
@@ -139,7 +138,7 @@ class DevStructure::Blueprint < Hash
     disclaimer = <<EOF
 \#
 \# #{owner}'s #{name}
-\# http#{token ? "s" : ""}://devstructure.com/blueprints/#{owner}/#{name}
+\# https://devstructure.com/blueprints/#{owner}/#{name}
 EOF
     if token
       disclaimer << <<EOF
@@ -215,7 +214,7 @@ EOF
         io.printf "#{command}\n", package, version
         if "apt" == manager \
           && package =~ /^rubygems(\d+\.\d+(?:\.\d+)?)$/ \
-          && "1.8" == $1
+          && rubygems_update?
           io.puts \
             "/usr/bin/gem#{$1} install --no-rdoc --no-ri rubygems-update"
           io.puts "/usr/bin/ruby#{$1} $(PATH=\"$PATH:/var/lib/gems/#{
@@ -346,7 +345,7 @@ EOF
 
           # However, if this package happens to be RubyGems, we introduce
           # a couple of new resources that update it to the latest version.
-          if package =~ /^rubygems(\d+\.\d+(?:\.\d+)?)$/ && "1.8" == $1
+          if package =~ /^rubygems(\d+\.\d+(?:\.\d+)?)$/ && rubygems_update?
             manifest[manager] << Puppet::Package.new("rubygems-update",
               :require => Puppet::Package["rubygems1.8"],
               :provider => :gem,
@@ -380,7 +379,7 @@ EOF
           manifest[manager] << Puppet::Exec.new(
             sprintf(command, package, version),
             :creates =>
-              "/usr/lib/ruby/gems/#{ruby_version}/gems/#{package}-#{version}",
+              "#{rubygems_path}/#{ruby_version}/gems/#{package}-#{version}",
             :require => [
               Puppet::Class[managers[manager]],
               Puppet::Package[manager],
@@ -496,7 +495,7 @@ EOF
         # install.
         when "apt"
           cookbook.apt_package package, :version => version
-          if package =~ /^rubygems(\d+\.\d+(?:\.\d+)?)$/ && "1.8" == $1
+          if package =~ /^rubygems(\d+\.\d+(?:\.\d+)?)$/ && rubygems_update?
             v = $1
             cookbook.gem_package "rubygems-update",
               :gem_binary => "/usr/bin/gem#{v}"
@@ -596,4 +595,26 @@ EOF
 
   end
 
+  # Return this release's codename.
+  def lsb_release_codename
+    @lsb_release_codename if defined?(@lsb_release_codename)
+    /\t(\w+)$/ =~ `/usr/bin/lsb_release -c`
+    @lsb_release_codename = $1
+  end
+
+  # Lucid and older need the rubygems-update gem.
+  def rubygems_update?
+    lsb_release_codename[0] < "m"[0]
+  end
+
+  # Platforms that need the rubygems-update gem install gems in a different
+  # location than typical Debian-based systems.
+  def rubygems_path
+    if rubygems_update?
+      "/usr/lib/ruby/gems"
+    else
+      "/var/lib/gems"
+    end
+  end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: devstructure
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 3
   prerelease: false
   segments: 
   - 0
   - 5
-  - 3
-  version: 0.5.3
+  - 4
+  version: 0.5.4
 platform: ruby
 authors: 
 - Richard Crowley
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-04 00:00:00 +00:00
+date: 2010-11-05 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -38,14 +38,14 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 11
         segments: 
         - 1
         - 4
-        - 2
-        version: 1.4.2
+        - 6
+        version: 1.4.6
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency