restfully 0.7.1.rc4 → 0.7.1.rc5

data/bin/restfully

@@ -19,7 +19,7 @@ end
 
 logger = Logger.new(STDERR)
 logger.level = Logger::WARN
-@options = {"logger" => logger, "require" => []}
+@options = {"logger" => logger}
 
 option_parser = OptionParser.new do |opts|
   opts.banner = <<BANNER
@@ -40,6 +40,7 @@ BANNER
     @options["configuration_file"] = v
   end
   opts.on("-r=", "--require=", "Require an additional media-type") do |v|
+    @options["require"] ||= []
     @options["require"].push(v)
   end
   opts.on("--log=", "Outputs log messages to the given file. Defaults to stdout") do |v|
@@ -63,24 +64,10 @@ end
 
 option_parser.parse!
 
-if @options["configuration_file"]
-  @options.merge!(YAML.load_file(
-    File.expand_path(@options["configuration_file"])
-  ))
-end
-
-@options["require"].each do |r|
-  logger.info "Requiring #{r} media-type..."
-  require "restfully/media_type/#{r.underscore}"
-end
-
 if given_uri = ARGV.shift
   @options["uri"] = given_uri
 end
 
-# Compatibility with restfully < 0.6
-@options["uri"] ||= @options.delete("base_uri")
-
 @session = Restfully::Session.new(@options)
 
 def session

data/lib/restfully/session.rb

@@ -16,10 +16,26 @@ module Restfully
     def initialize(options = {})
       @config = options.symbolize_keys
       @logger = @config.delete(:logger) || Logger.new(STDERR)
+
+      # Read configuration from file:
+      config_file = @config.delete(:configuration_file) || ENV['RESTFULLY_CONFIG']
+      config_file = File.expand_path(config_file) if config_file
+      if config_file && File.file?(config_file) && File.readable?(config_file)
+        @logger.info "Using configuration file located at #{config_file}."
+        @config = YAML.load_file(config_file).symbolize_keys.merge(@config)
+      end
+
+      # Require additional media-types:
+      (@config[:require] || []).each do |r|
+        @logger.info "Requiring #{r} media-type..."
+        require "restfully/media_type/#{r.underscore}"
+      end
+
       @config[:retry_on_error] ||= 5
       @config[:wait_before_retry] ||= 5
 
-      @uri = @config.delete(:uri)
+      # Compatibility with :base_uri parameter of Restfully <= 0.6
+      @uri = @config.delete(:uri) || @config.delete(:base_uri)
       if @uri.nil? || @uri.empty?
         raise ArgumentError, "You must pass a :uri option."
       else

data/lib/restfully/version.rb

@@ -1,3 +1,3 @@
 module Restfully
-  VERSION = "0.7.1.rc4"
+  VERSION = "0.7.1.rc5"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: restfully
 version: !ruby/object:Gem::Version 
-  hash: 15424101
+  hash: 15424103
   prerelease: 6
   segments: 
   - 0
   - 7
   - 1
   - rc
-  - 4
-  version: 0.7.1.rc4
+  - 5
+  version: 0.7.1.rc5
 platform: ruby
 authors: 
 - Cyril Rohr