rconf 0.6.15 → 0.6.16

data/.gitignore

@@ -1,3 +1,4 @@
 tags
 pkg/*
 .rvmrc
+Gemfile.lock

data/Gemfile

@@ -0,0 +1,10 @@
+source :gemcutter
+
+gem 'json', '> 1.1.6'
+
+#Gems needed to execute the unit specs.
+group :test do
+  gem 'rspec',              '~> 2.5'
+  gem 'flexmock',           '~> 0.9'
+end
+

data/bin/rconf

@@ -12,6 +12,7 @@
 
 $stdout.sync = true
 
+require 'json'
 require File.join(File.dirname(__FILE__), '..', 'lib', 'rconf')
 
 module RightConf
@@ -33,6 +34,7 @@ where [options] are:
         EOS
 
         opt :configurators, 'Show available configurators'
+        opt :update, 'Update rconf to latest version'
         opt :config, 'Set path to configuration file', :type => :string
         opt :output, 'Output file (output to STDOUT by default)', :type => :string
         opt :force, 'Run rconf even if configuration file has not changed'
@@ -53,9 +55,85 @@ where [options] are:
           Trollop::die :output, "Failed to initialize output file: #{e.message}"
         end
       end
-      new.configure(opts)
+      if opts[:configurators]
+        new.list_configurators
+      elsif opts[:update]
+        new.update
+      else
+        new.configure(opts)
+      end
+    end
+
+    # List all available configurators
+    #
+    # === Return
+    # true:: Always return true
+    def list_configurators
+      puts "The following configurators are registered:\n\n"
+      ConfiguratorRegistry.each do |key, configurator|
+        puts "== #{key} ==".bold
+        puts configurator.desc
+        puts 'Settings:'
+        max_size = configurator.all_settings.keys.map(&:to_s).map(&:size).max
+        configurator.all_settings.each do |name, desc|
+          num_spaces = max_size - name.to_s.size + 1
+          print "  - #{name.to_s.blue}:#{' ' * num_spaces}#{desc}"
+          required_settings = configurator.required_settings || []
+          if required_settings.include?(name)
+            puts ' [required]'.green
+          else
+            puts
+          end
+        end
+        puts
+      end
+    end
+
+    # Update rconf to latest in all installed rubies
+    #
+    # === Return
+    # true:: Always return true
+    def update
+      ProgressReporter.report_to_stdout
+      report_check 'Retrieving latest rconf...'
+      json = Command.execute('curl', '-s', 'http://rubygems.org/api/v1/gems/rconf.json').output
+      info = JSON.load(json)
+      report_fatal 'Failed to retrieve rconf gem information, check network connectivity' unless info
+      version = info['version']
+      report_success
+      report('Latest rconf version is ' + version.blue)
+      rubies = Command.execute('rvm', 'list').output
+      rubies = rubies.split("\n")[3..-1]
+      update_rconf(rubies, version)
     end
 
+    # Update rconf for given rubies if required
+    #
+    # === Parameters
+    # rubies(Array):: List of rubies as returned by 'rvm list'
+    # version(String):: Latest version
+    #
+    # === Return
+    # true:: Always return true
+    def update_rconf(rubies, version)
+      rubies.each do |ruby|
+        ruby =~ /(\s+| =>)([^ ]*)\s.*/
+        ruby = Regexp.last_match(2)
+        report_check("Checking rconf for #{ruby}")
+        rconf = Command.execute('rvm', "#{ruby}@global", 'exec', 'gem', 'list', 'rconf').output
+        if rconf =~ /rconf \(#{version}\)/
+          report_success
+          next
+        else
+          report_failure
+          report_check("Updating rconf for #{ruby}")
+          res = Command.execute('rvm', "#{ruby}@global", 'exec', 'gem', 'install', 'rconf')
+          report_result(res.success?)
+        end
+      end
+    end
+
+
     # Actually configure environment
     #
     # === Parameters
@@ -65,27 +143,6 @@ where [options] are:
     # === Return
     # true:: Always return true
     def configure(options)
-      if options[:configurators]
-        puts "The following configurators are registered:\n\n"
-        ConfiguratorRegistry.each do |key, configurator|
-          puts "== #{key} ==".bold
-          puts configurator.desc
-          puts 'Settings:'
-          max_size = configurator.all_settings.keys.map(&:to_s).map(&:size).max
-          configurator.all_settings.each do |name, desc|
-            num_spaces = max_size - name.to_s.size + 1
-            print "  - #{name.to_s.blue}:#{' ' * num_spaces}#{desc}"
-            required_settings = configurator.required_settings || []
-            if required_settings.include?(name)
-              puts ' [required]'.green
-            else
-              puts
-            end
-          end
-          puts
-        end
-        exit 0
-      end
       Profile.reset if options[:force]
       ProgressReporter.report_to_stdout
       ProgressReporter.report_to_file(options[:output]) if options[:output]

data/lib/rconf/configurators/bundler_configurator.rb

@@ -75,11 +75,16 @@ module RightConf
         report_success
       end
       report_check("Installing bundler #{version}")
-      gem_path DEFAULT_GEM_PATH unless gem_path
-      bundler_file = File.join(gem_path, "bundler-#{version}.gem")
-      report_fatal("Missing bundler gem at #{bundler_file}") unless File.exist?(bundler_file)
-      res = Command.execute('gem','install',  bundler_file, '--no-ri', '--no-rdoc',
-                           :abort_on_failure => 'Failed to install bundler')
+      if gem_path 
+        bundler_file = [ File.join(gem_path, "bundler-#{version}.gem") ]
+        report_fatal("Missing bundler gem at #{bundler_file}") unless File.exist?(bundler_file)
+      else
+        bundler_file = [ 'bundler', '-v', version ]
+      end
+      options = [ 'gem','install' ]
+      options += bundler_file
+      options += [ '--no-ri', '--no-rdoc', :abort_on_failure => 'Failed to install bundler' ]
+      res = Command.execute(*options)
       report_success
       true
     end

data/lib/rconf/version.rb

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

data/rconf.gemspec

@@ -13,6 +13,8 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = 'rconf'
 
+  s.add_dependency('json', '> 1.1.6')
+
   s.add_development_dependency('rspec', "~> 2.5")
   s.add_development_dependency('flexmock', "~> 0.9")
 

data/{rconf.rc → rconf.rconf}

@@ -4,4 +4,8 @@ ruby do
   rubygems '1.3.7'
   gemset   'rconf'
 end
+bundler do
+  version '1.0.10'
+end
+
 

metadata

@@ -2,7 +2,7 @@
 name: rconf
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.6.15
+  version: 0.6.16
 platform: ruby
 authors: 
 - Raphael Simon
@@ -14,27 +14,38 @@ date: 2011-03-12 23:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: json
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        version: 1.1.6
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: "2.5"
   type: :development
-  version_requirements: *id001
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: flexmock
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: "0.9"
   type: :development
-  version_requirements: *id002
+  version_requirements: *id003
 description: |
   rconf configures the environment for a given application. rconf reads
   the content of an application configuration file and installs and/or
@@ -54,6 +65,7 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- Gemfile
 - README.rdoc
 - Rakefile
 - bin/rconf
@@ -80,7 +92,7 @@ files:
 - lib/rconf/trollop.rb
 - lib/rconf/version.rb
 - rconf.gemspec
-- rconf.rc
+- rconf.rconf
 - spec/command_spec.rb
 - spec/configurator_spec.rb
 - spec/configurators/bundler_configurator_spec.rb