devstructure 0.0.8 → 0.1.0

data/lib/devstructure/blueprint.rb

@@ -173,12 +173,10 @@ EOF
       :package => lambda { |manager, command, package, version|
         command =~ /gem(\d+\.\d+) install/
         case manager
-
-        # Ruby gems.  We grab gems installed by Rip and put them on the
-        # real system.
-        # TODO If the user's using one of the custom opt-ruby-* packages,
-        # we should notice and wrap around into the system's equivalent
-        # package instead of blindly installing it off to the side.
+        when "apt"
+          unless manager == package
+            puts Package.partial(package, :ensure => version)
+          end
         when "rubygems-update"
           unless manager == package
             puts Package.partial(package,
@@ -195,10 +193,6 @@ EOF
           }
           options[:require] += [Package[manager]] unless manager == package
           puts Package.partial(package, options)
-        when /ruby/
-          puts Exec.partial(sprintf("#{command}\n", package, version),
-            :require => Package[manager]
-          )
         when /python/
           puts Exec.partial(sprintf("#{command}\n", package),
             :require => Package[manager, "python-setuptools"]
@@ -206,15 +200,10 @@ EOF
 
         # TODO Expand Java, Erlang, etc.
 
-        # Debian packages get no special treatment.
         else
-          unless manager == package
-            puts Package.partial(package,
-              :require => Package[manager],
-              :ensure => version
-            )
-          end
-
+          puts Exec.partial(sprintf("#{command}\n", package, version),
+            :require => Package[manager]
+          )
         end
       },
       :after => lambda { |manager, command|
@@ -294,8 +283,10 @@ EOF
 
       # Handle packages.
       if options[:package].respond_to?(:call)
-        options[:package].call options[:manager],
-          packages[options[:manager]]["_command"], package, version
+        [version].flatten.each do |v|
+          options[:package].call options[:manager],
+            packages[options[:manager]]["_command"], package, v
+        end
       end
 
       if options[:manager] != package && packages[package]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: devstructure
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 27
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 8
-  version: 0.0.8
+  version: 0.1.0
 platform: ruby
 authors: 
 - Richard Crowley
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-16 00:00:00 +00:00
+date: 2010-06-24 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency