r10k 1.0.0rc2 → 1.0.0rc3

data/lib/r10k/cli.rb

@@ -22,7 +22,7 @@ module R10K::CLI
       end
 
       required :v, :verbose, 'Set verbosity level' do |value, cmd|
-        R10K::Logging.level = Integer(value)
+        R10K::Logging.level = value
       end
 
       flag :t, :trace, 'Display stack traces on application crash'

data/lib/r10k/deployment/config.rb

@@ -25,7 +25,6 @@ class Config
 
     # Scan all possible keys to see if the config has a matching value
     keys.inject(nil) do |rv, k|
-      require 'pry'; binding.pry
       v = @config[k]
       break v unless v.nil?
     end

data/lib/r10k/logging.rb

@@ -7,6 +7,8 @@ module R10K::Logging
 
   include Log4r
 
+  LOG_LEVELS = %w{DEBUG2 DEBUG1 DEBUG INFO NOTICE WARN ERROR FATAL}
+
   def logger_name
     self.class.to_s
   end
@@ -22,9 +24,24 @@ module R10K::Logging
   class << self
     include Log4r
 
+    def levels
+      @levels ||= LOG_LEVELS.each.inject({}) do |levels, k|
+        levels[k] = Log4r.const_get(k)
+        levels
+      end
+    end
+
+    def parse_level(val)
+      begin
+        Integer(val)
+      rescue
+        levels[val.upcase]
+      end
+    end
+
     def included(klass)
       unless @log4r_loaded
-        Configurator.custom_levels(*%w{DEBUG2 DEBUG1 DEBUG INFO NOTICE WARN ERROR FATAL})
+        Configurator.custom_levels(*LOG_LEVELS)
         Logger.global.level = Log4r::ALL
         @log4r_loaded = true
       end
@@ -35,8 +52,10 @@ module R10K::Logging
     end
 
     def level=(val)
-      outputter.level = val
-      @level = val
+      level = parse_level val
+      raise "Invalid log level: #{val}" unless level
+      outputter.level = level
+      @level = level
     end
 
     def formatter

data/lib/r10k/module/forge.rb

@@ -19,7 +19,7 @@ class Forge
 
   include R10K::Logging
 
-  attr_accessor :version, :owner, :full_name
+  attr_accessor :owner, :full_name
 
   def initialize(name, basedir, args)
     @full_name = name

data/lib/r10k/version.rb

@@ -1,3 +1,3 @@
 module R10K
-  VERSION = '1.0.0rc2'
+  VERSION = '1.0.0rc3'
 end

data/spec/unit/module/forge_spec.rb

@@ -45,21 +45,19 @@ describe R10K::Module::Forge do
 
       it { should be_insync }
       its(:version) { should eq '8.0.0' }
-      its(:current_version) { should eq '8.0.0' }
     end
 
     describe "and the desired version is newer than the installed version" do
       subject { described_class.new('branan/eight_hundred', fixture_modulepath, '80.0.0') }
 
       it { should_not be_insync }
-      its(:version) { should eq '80.0.0' }
-      its(:current_version) { should eq '8.0.0' }
+      its(:version) { should eq 'v8.0.0' }
 
       it "should try to upgrade the module" do
         # "v80.0.0" ? Seriously? Where did the "v" come from?
         expected = %w{upgrade --version=v80.0.0 --ignore-dependencies branan/eight_hundred}
         subject.expects(:pmt).with(expected)
-        subject.sync!
+        subject.sync
       end
     end
 
@@ -67,14 +65,13 @@ describe R10K::Module::Forge do
       subject { described_class.new('branan/eight_hundred', fixture_modulepath, '7.0.0') }
 
       it { should_not be_insync }
-      its(:version) { should eq '7.0.0' }
-      its(:current_version) { should eq '8.0.0' }
+      its(:version) { should eq 'v8.0.0' }
 
       it "should try to downgrade the module" do
         # Again with the magical "v" prefix to the version.
         expected = %w{upgrade --version=v7.0.0 --ignore-dependencies branan/eight_hundred}
         subject.expects(:pmt).with(expected)
-        subject.sync!
+        subject.sync
       end
     end
 
@@ -82,13 +79,12 @@ describe R10K::Module::Forge do
       subject { described_class.new('branan/eight_hundred', empty_modulepath, '8.0.0') }
 
       it { should_not be_insync }
-      its(:version) { should eq '8.0.0' }
-      its(:current_version) { should eq SemVer::MIN }
+      its(:version) { should eq SemVer::MIN }
 
       it "should try to install the module" do
         expected = %w{install --version=v8.0.0 --ignore-dependencies branan/eight_hundred}
         subject.expects(:pmt).with(expected)
-        subject.sync!
+        subject.sync
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: r10k
 version: !ruby/object:Gem::Version
-  version: 1.0.0rc2
+  version: 1.0.0rc3
   prerelease: 5
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-17 00:00:00.000000000 Z
+date: 2013-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -209,3 +209,4 @@ test_files:
 - spec/unit/git/cache_spec.rb
 - spec/unit/deployment/environment_spec.rb
 - spec/unit/module/forge_spec.rb
+has_rdoc: