nexus_cli 4.0.2 → 4.0.3

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 4.0.3
+
+* Support old-style overriding of config file.
+
 # 4.0.2
 
 * #89 - Restrict activesupport gem to 3.2.0 .

data/README.md

@@ -83,13 +83,13 @@ There are also two global config options, `--overrides` which overrides the conf
 ## Pull Artifact Example
 
 ```
-nexus-cli pull_artifact com.mycompany.artifacts:myartifact:1.0.0:tgz
+nexus-cli pull_artifact com.mycompany.artifacts:myartifact:tgz:1.0.0
 ```
 
 ## Push Artifact Example
 
 ```
-nexus-cli push_artifact com.mycompany.artifacts:myartifact:1.0.0:tgz ~/path/to/file/to/push/myartifact.tgz
+nexus-cli push_artifact com.mycompany.artifacts:myartifact:tgz:1.0.0 ~/path/to/file/to/push/myartifact.tgz
 ```
 
 ## Search Example

data/VERSION

@@ -1 +1 @@
-4.0.2
+4.0.3

data/lib/nexus_cli/configuration.rb

@@ -21,7 +21,10 @@ module NexusCli
       def from_overrides(overrides)
         raise MissingSettingsFileException unless overrides
         overrides = overrides.with_indifferent_access
-        new(overrides)
+
+        configuration = (load_config || Hash.new).with_indifferent_access
+        configuration.merge!(overrides)
+        new(configuration)
       end
 
       # Creates a new instance of the Configuration object from the config file
@@ -29,9 +32,8 @@ module NexusCli
       #
       # @return [NexusCli::Configuration]
       def from_file
-        config = YAML.load_file(file_path)
+        config = load_config
         raise MissingSettingsFileException unless config
-
         config = config.with_indifferent_access
         new(config)
       end
@@ -47,6 +49,19 @@ module NexusCli
           raise InvalidSettingsException.new(config.errors)
         end
       end
+
+      private
+
+        # Loads the config file
+        #
+        # @return [Hash]
+        def load_config
+          begin
+            config = YAML.load_file(file_path)
+          rescue Errno::ENOENT
+            nil
+          end
+        end
     end
 
     def validate!

data/spec/unit/nexus_cli/configuration_spec.rb

@@ -38,6 +38,28 @@ describe NexusCli::Configuration do
         expect { from_overrides.validate! }.not_to raise_error
       end
     end
+
+    context "when a config file exists" do
+      let(:from_overrides) { configuration.from_overrides(partial_override) }
+      let(:partial_override) do
+        {
+          "repository" => "foobar"
+        }
+      end
+      let(:partial_config_file) do
+        {
+          "url" => "http://somewebsite.com"
+        }
+      end
+
+      before do
+        YAML.stub(:load_file).and_return(partial_config_file)
+      end
+
+      it "uses non-overridden parts from the file" do
+        expect(from_overrides.url).to eql("http://somewebsite.com")
+      end
+    end
   end
 
   describe "::from_file" do
@@ -112,7 +134,7 @@ describe NexusCli::Configuration do
     let(:repository_config) { described_class.new(url: url, repository: repository, username: username, password: password) }
 
     it "returns the repository" do
-      expect(config_instance.repository).to eq("foo")
+      expect(repository_config.repository).to eq("releases")
     end
 
     context "when repository has illegal values" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nexus_cli
 version: !ruby/object:Gem::Version
-  version: 4.0.2
+  version: 4.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-27 00:00:00.000000000 Z
+date: 2013-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -288,7 +288,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4077322274439480669
+      hash: 1086708981034420466
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -297,7 +297,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4077322274439480669
+      hash: 1086708981034420466
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23