akamai_api 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5471cead7136c03a256bfa36ee7e0ff4deebe75
-  data.tar.gz: ca5fc17984627473a1ef8ca0bba3d71323c50dc9
+  metadata.gz: 6db87fa3be02df005df62f70c5b518244defda40
+  data.tar.gz: 718930e9c32466a64ca039667aff84024537ded4
 SHA512:
-  metadata.gz: 71bfc3d69a49793659cb20aa4beefc2c52078fc1f9c546c7145e463f26a0748edfb1cc7ba27dbf1af48e4f455bdbd22c2f4421fa523ffd7c2acafadbfceef8e7
-  data.tar.gz: 5d7b81ba09fbe655bc59386173f9628cc445551dd7027c5b876d68c414d19c3794034607ca3f016264d71de63a73f9ad65162104bfaed93f66eeba1fd884451f
+  metadata.gz: 912099d1f5670f672d2d70303a80992a44079d4a942d2bcaacb87c028ae68adf26e9061f4f22cf1e3f2f652c42eca557fb0013aebc7bb775450daff6e8fa322c
+  data.tar.gz: 40c41f89eb6d8d90f6fe692da75e870cab47fa8b63b92fad1b620113310fe09b3dd9cc21ac8e972bca18681121f80dcdc45b2da6a1f4d6d2061a97de59912149

data/lib/akamai_api/cli/command.rb

@@ -8,15 +8,19 @@ module AkamaiApi
 
       no_tasks do
         def load_config
+          config = {}
           config_file = File.expand_path '~/.akamai_api.yml'
-          config = YAML::load_file(config_file).symbolize_keys
+          if File::exists?( config_file )
+            config = YAML::load_file(config_file).symbolize_keys
+          end
+          if ENV['AKAMAI_USERNAME'] && ENV['AKAMAI_PASSWORD']
+            config.merge! :auth => [ENV['AKAMAI_USERNAME'], ENV['AKAMAI_PASSWORD']]
+          end
           if options[:username] && options[:password]
             config.merge! :auth => [options[:username], options[:password]]
-          elsif ENV['AKAMAI_USERNAME'] && ENV['AKAMAI_PASSWORD']
-            config.merge! :auth => [ENV['AKAMAI_USERNAME'], ENV['AKAMAI_PASSWORD']]
           end
           if config[:auth].nil? || config[:auth].compact.blank?
-            raise "#{config_file} does not exist or doesn't contain auth info and you didn't specify username and password options"
+            raise "#{config_file} does not exist OR doesn't contain auth info OR you didn't export environment variables OR you didn't specify username and password on the command line"
           end
           AkamaiApi.config.merge! config
         end

data/lib/akamai_api/version.rb

@@ -1,3 +1,3 @@
 module AkamaiApi
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: akamai_api
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Nicola Racco
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-19 00:00:00.000000000 Z
+date: 2013-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport