rconf 0.5.6 → 0.5.8

data/lib/rconf.rb

@@ -19,6 +19,7 @@ require File.join(BASE_DIR, 'configurator_registry')
 require File.join(BASE_DIR, 'configurator')
 require File.join(BASE_DIR, 'language')
 require File.join(BASE_DIR, 'platform')
+require File.join(BASE_DIR, 'profile')
 require File.join(BASE_DIR, 'trollop')
 require File.join(BASE_DIR, 'version')
 

data/lib/rconf/configurator.rb

@@ -9,6 +9,8 @@
 # License Agreement between RightScale.com, Inc. and
 # the licensee
 
+require 'digest/sha1'
+
 module RightConf
 
   # Configurator mixin, defines DSL and common validation method
@@ -118,10 +120,24 @@ module RightConf
     # true:: Always return true
     def run(*args)
       init
-      Platform.dispatch(*args) { :run }
+      sha = Profile.configurator_signature(self.class.key)
+      if sha != signature
+        Platform.dispatch(*args) { :run }
+        Profile.set_configurator_signature(self.class.key, signature)
+      end
       true
     end
 
+    # Calculate unique SHA for current settings
+    #
+    # === Return
+    # sha(String):: SHA for current settings
+    def signature
+      return '' if @settings_values.nil?
+      blob = @settings_values.inject('') { |b, (k, v)| b += "#{k}:#{v};" }
+      sha = Digest::SHA1.hexdigest(blob)
+    end
+
     # Get value of configuration option
     #
     # === Parameters

data/lib/rconf/configurators/bundler_configurator.rb

@@ -65,8 +65,7 @@ module RightConf
       exists = res.success? && res.output !~ /exec: bundle: not found/
       if exists
         report_check('Uninstalling existing versions of bundler')
-        res = Command.execute('gem', 'uninstall', 'bundler', '-a', '-x', 
-                              :abort_on_failure => 'Failed to uninstall bundler')
+        Command.execute('gem', 'uninstall', 'bundler', '-a', '-x')
         report_success
       end
       report_check("Installing bundler #{version}")

data/lib/rconf/profile.rb

@@ -0,0 +1,80 @@
+# Copyright (C) 2011 RightScale, Inc, All Rights Reserved Worldwide.
+#
+# THIS PROGRAM IS CONFIDENTIAL AND PROPRIETARY TO RIGHTSCALE
+# AND CONSTITUTES A VALUABLE TRADE SECRET. Any unauthorized use,
+# reproduction, modification, or disclosure of this program is
+# strictly prohibited. Any use of this program by an authorized
+# licensee is strictly subject to the terms and conditions,
+# including confidentiality obligations, set forth in the applicable
+# License Agreement between RightScale.com, Inc. and
+# the licensee
+
+module RightConf
+
+  class Profile
+
+    include Singleton
+
+    # Load profile from disk on instantiation
+    def initialize
+      if File.exist?(profile_path)
+        @profile = YAML.load(IO.read(profile_path)) rescue {}
+        puts "LOADED PROFILE: #{@profile}"
+      else
+        @profile = {}
+      end
+    end
+
+    # Retrieve persisted configurator signature
+    #
+    # === Return
+    # signature(String):: Persisted configurator signature
+    def configurator_signature(key)
+      sigs = @profile[:configurator_signatures]
+      signature = sigs && sigs[key]
+    end
+
+    # Set signature for given configurator
+    #
+    # === Parameters
+    # key(String):: Configurator key
+    # signature(String):: Persisted configurator signature
+    #
+    # === Return
+    # true:: Always return true
+    def set_configurator_signature(key, signature)
+      @profile[:configurator_signatures] ||= {}
+      @profile[:configurator_signatures][key] = signature
+      persist
+      true
+    end
+
+    # Entire profile with all settings
+    #
+    # === Return
+    # profile(Hash):: Profile settings
+    def profile
+      @profile
+    end
+
+    protected
+
+    # Retrieve profile file path
+    #
+    # === Return
+    # path(String):: Profile file path
+    def profile_path
+      profile_path = ENV['RCONF_PROFILE'] || File.join(ENV['HOME'], '.rconf')
+    end
+
+    # Persist profile to file
+    #
+    # === Return
+    # true:: Always return true
+    def persist
+      File.open(profile_path, 'w') { |f| f.puts YAML.dump(@profile) } unless @profile.nil?
+    end
+
+  end
+end
+

data/lib/rconf/version.rb

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

data/spec/configurator_spec.rb

@@ -21,6 +21,9 @@ describe RightConf::Configurator do
     def test_setter(value)
       @custom_setting = value
     end
+    def run_darwin; end
+    alias :run_linux :run_darwin
+    alias :run_windows :run_darwin
   end
 
   class AnotherConfigurator
@@ -58,6 +61,18 @@ describe RightConf::Configurator do
     @configurator.validate.should be_nil
   end
 
+  it 'should persist the signature of configurators that ran' do
+    flexmock(RightConf::Profile.instance).should_receive(:set_configurator_signature).once
+    @configurator.run
+  end
+
+  it 'should skip configurators that have already run' do
+    flexmock(RightConf::Profile.instance).should_receive(:configurator_signature).with(:test).and_return('42')
+    flexmock(@configurator).should_receive(:signature).and_return('42')
+    flexmock(RightConf::Platform.instance).should_receive(:dispatch).never
+    @configurator.run
+  end
+
 end
 
 

data/spec/profile_spec.rb

@@ -0,0 +1,24 @@
+# Copyright (C) 2011 RightScale, Inc, All Rights Reserved Worldwide.
+#
+# THIS PROGRAM IS CONFIDENTIAL AND PROPRIETARY TO RIGHTSCALE
+# AND CONSTITUTES A VALUABLE TRADE SECRET. Any unauthorized use,
+# reproduction, modification, or disclosure of this program is
+# strictly prohibited. Any use of this program by an authorized
+# licensee is strictly subject to the terms and conditions,
+# including confidentiality obligations, set forth in the applicable
+# License Agreement between RightScale.com, Inc. and
+# the licensee
+
+require File.join(File.dirname(__FILE__), 'spec_helper')
+
+describe RightConf::Profile do
+
+  it 'should save profile to disk when changing values' do
+    flexmock(RightConf::Profile.instance).should_receive(:persist).once
+    RightConf::Profile.set_configurator_signature(:test, '42')
+  end
+
+end
+
+
+

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rconf
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.5.6
+  hash: 27
+  prerelease: false
+  segments: 
+  - 0
+  - 5
+  - 8
+  version: 0.5.8
 platform: ruby
 authors: 
 - Raphael Simon
@@ -10,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-06 00:00:00 -08:00
+date: 2011-03-07 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,6 +26,10 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 2
+        - 5
         version: "2.5"
   type: :development
   version_requirements: *id001
@@ -32,6 +41,10 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 9
         version: "0.9"
   type: :development
   version_requirements: *id002
@@ -70,6 +83,7 @@ files:
 - lib/rconf/platforms/darwin.rb
 - lib/rconf/platforms/linux.rb
 - lib/rconf/platforms/windows.rb
+- lib/rconf/profile.rb
 - lib/rconf/progress_reporter.rb
 - lib/rconf/progress_reporters/base_reporter.rb
 - lib/rconf/progress_reporters/file_reporter.rb
@@ -85,6 +99,7 @@ files:
 - spec/configurators/ruby_configurator_spec.rb
 - spec/language_spec.rb
 - spec/platform_spec.rb
+- spec/profile_spec.rb
 - spec/progress_reporters/base_reporter_spec.rb
 - spec/progress_reporters/file_reporter_spec.rb
 - spec/progress_reporters/stdout_reporter_spec.rb
@@ -104,17 +119,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: rconf
-rubygems_version: 1.5.0
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Cross platform environment configuration
@@ -126,6 +147,7 @@ test_files:
 - spec/configurators/ruby_configurator_spec.rb
 - spec/language_spec.rb
 - spec/platform_spec.rb
+- spec/profile_spec.rb
 - spec/progress_reporters/base_reporter_spec.rb
 - spec/progress_reporters/file_reporter_spec.rb
 - spec/progress_reporters/stdout_reporter_spec.rb