rconf 0.9.12 → 0.9.17

data/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2009-2012 RightScale, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/rconf/command.rb

@@ -18,9 +18,6 @@ module RightConf
     include Singleton
     include ProgressReporter
 
-    # Builtin RVM commands
-    RVM_COMMANDS = [ 'gem', 'rubygems' ]
-
     # Execute given command with given arguments
     #
     # === Parameters
@@ -37,6 +34,8 @@ module RightConf
     def execute(command, *args)
       ENV['rvm_is_not_a_shell_function'] = '0'
       ENV['rvm_ignore_rvmrc'] = '1'
+      ENV['rvm_reload_flag'] = '0'
+      ENV['rvm_project_rvmrc'] = '0'
       opts = {}
       if !args.empty? && args[-1].is_a?(Hash)
         opts = args[-1]
@@ -71,14 +70,8 @@ module RightConf
     #   and thus could be successful when the command actually failed...
     def execute_in_ruby(command, *args)
       report_fatal('Failed to run in ruby context, no ruby specified') unless @rvm_prefix
-      commands = if RVM_COMMANDS.include?(command)
-                   @rvm_prefix + [ command ]
-                 else
-                   @rvm_prefix + [ 'exec', '--', command ]
-                 end
+      commands = @rvm_prefix + [ 'exec', '--', command ]
       args = commands + args
-      ENV['rvm_is_not_a_shell_function'] = '0'
-      ENV['rvm_ignore_rvmrc'] = '1'
       execute('rvm', *args)
     end
 

data/lib/rconf/configurators/bundler_configurator.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2011 RightScale, Inc, All Rights Reserved Worldwide.
+# Copyright (C) 2011-2012 RightScale, Inc, All Rights Reserved Worldwide.
 #
 # THIS PROGRAM IS CONFIDENTIAL AND PROPRIETARY TO RIGHTSCALE
 # AND CONSTITUTES A VALUABLE TRADE SECRET. Any unauthorized use,
@@ -21,7 +21,7 @@ module RightConf
 
     description 'Installs bundler and runs "bundle install"'
 
-    settings :version     => 'Version of bundler gem, e.g. "1.0.10"',
+    settings :version     => 'Version of bundler gem, e.g. "1.0.21"',
              :exclusions  => 'Comma separated list of gem groups to be excluded when installing bundle',
              :bundle_path => 'Path where bundle should be installed',
              :gem_path    => 'Path to bundler gem, e.g. "vendor/system_gems/cache"'

data/lib/rconf/configurators/ruby_configurator.rb

@@ -13,12 +13,6 @@ module RightConf
 
   class RubyConfigurator
 
-    # RVM version used to install rubies
-    RVM_VERSION = '1.10.2'
-
-    # RVM releases URL
-    RVM_RELEASES_URL = 'https://rvm.beginrescueend.com/releases'
-
     include Configurator
 
     register :ruby
@@ -32,6 +26,12 @@ module RightConf
 
     validate_has_settings :version
 
+    # RVM version used to install rubies
+    RVM_VERSION = '1.10.2'
+
+    # RVM releases URL
+    RVM_RELEASES_URL = 'https://rvm.beginrescueend.com/releases'
+
     # Let configurator run, it is idempotent
     #
     # === Return
@@ -92,8 +92,8 @@ module RightConf
                         :abort_on_failure => "Failed to switch to gemset '#{gemset}'")
         report_success
         report_check("Checking whether rconf is installed")
-        res = Command.execute('rconf', '--version')
-        if res.output =~ /VERSION/
+        res = Command.execute_in_ruby('rconf', '--version')
+        if res.output =~ /#{RightConf::VERSION}/
           report_success
         else
           report_failure

data/lib/rconf/version.rb

@@ -13,7 +13,7 @@ module RightConf
 
   MAJOR = 0
   MINOR = 9
-  BUILD = 12
+  BUILD = 17
 
   VERSION = [MAJOR, MINOR, BUILD].map(&:to_s).join('.')
 

metadata

@@ -5,9 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 12
-  segments_generated: true
-  version: 0.9.12
+  - 17
+  version: 0.9.17
 platform: ruby
 authors: 
 - Raphael Simon
@@ -15,37 +14,37 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-05 00:00:00 -08:00
+date: 2012-02-25 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  name: rspec
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 2
         - 5
-        segments_generated: true
         version: "2.5"
-  requirement: *id001
-  name: rspec
-  prerelease: false
   type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  name: flexmock
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 0
         - 9
-        segments_generated: true
         version: "0.9"
-  requirement: *id002
-  name: flexmock
-  prerelease: false
   type: :development
+  version_requirements: *id002
 description: |
   rconf configures the environment for a given application. rconf reads
   the content of an application configuration file and installs and/or
@@ -66,6 +65,7 @@ extra_rdoc_files: []
 files: 
 - .gitignore
 - Gemfile
+- LICENSE
 - README.rdoc
 - Rakefile
 - bin/rconf
@@ -128,25 +128,25 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
       segments: 
       - 0
-      segments_generated: true
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
       segments: 
       - 0
-      segments_generated: true
       version: "0"
 requirements: []
 
 rubyforge_project: rconf
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Cross platform environment configuration