grifter 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4b156d151835e6627b686b679baf97d38618dc1
-  data.tar.gz: 08cb91638ad50478b0f94eeaf136afe51214af54
+  metadata.gz: 272206b2927fd805a4d0eebfaeb12aa9bb5544b8
+  data.tar.gz: 811ddf5f1872f2c8a82a0ccf7fb5082d7d5537ac
 SHA512:
-  metadata.gz: 91807edba6321e443c70456ec51df0aa1f80ee6e2edb0eb2ca7cf8ed9501a7eed4b3e067a92de48856dd0837448035e5417e4eb231bef9ca5f233d9e0c97d7fe
-  data.tar.gz: c156a39a751881f891fe7fcb4bf79f880e2f40a1b546342fc862986926149dd997030c974816e047cf18092430bf7c68f869f669bb39e93eae184e8e4f287425
+  metadata.gz: e687565405a56497e50a449267895dc594006df2ae3679034003fc24132937fab025a76f3204e1707af89a8456c661b50a9766bec55d50b02343221262874759
+  data.tar.gz: 4aaf0eda705b509714ffbcb3b02d2d06df44dbf3645ebb412ccc6bb20dcef047bfac5693815bedfa4b26421689480cc432080e150931896031bf9a146418914f

data/Readme.md

@@ -57,7 +57,7 @@ which is accessible without needing any authentication key:
     mkdir owm_grifts
     touch owm_grifts/weather_grifts.rb
 
-### add method for checking weather to owm/weather.rb
+### add method for checking weather to owm_grifts/weather.rb
     def weather_for city
       owm.get "/data/2.5/weather?q=#{URI.encode(city)}"
     end
@@ -118,7 +118,8 @@ Setup spec/weather_spec.rb with contents like:
     describe "getting weather reports" do
       it "should know the weather for New York City" do
         response = weather_for 'New York, NY'
-        response['main'].keys.should =~ ['temp', 'temp_min', 'temp_max', 'humidity', 'pressure']
+        expected_items = ['temp', 'temp_min', 'temp_max', 'humidity', 'pressure']
+        response['main'].keys.should include(*expected_items) 
       end
     end
 

data/bin/grift

@@ -46,6 +46,11 @@ def parse_cmd_line
     opts.on("-n", "--no-authenticate",
            "Do not authenticate") { options[:authenticate] = false }
 
+    opts.on('-l', "--list", "Print each available grift method") do
+      options[:list_grift_methods] = true
+      options[:authenticate] = false #no point in authenticating for --list
+    end
+
   end
   optparse.parse!
   options
@@ -66,6 +71,17 @@ rescue GrifterConfigFileMissing => e
   Kernel.abort
 end
 
+if options[:list_grift_methods]
+  puts "Grift method listing"
+
+  grifter.singleton_methods.sort.each do |meth|
+    puts " - #{meth}(#{grifter.method(meth).parameters.join(', ')})"
+
+  end
+
+  exit
+end
+
 if not(ARGV.empty?)
   #a grift method has been specified on the command line
   method = ARGV.shift

data/grifter.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "grifter"
-  s.version = "0.1.2"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Robert Schultheis"]
-  s.date = "2013-10-07"
+  s.date = "2013-11-05"
   s.description = "convention based approach to interfacing with an HTTP JSON API."
   s.email = "rob@knewton.com"
   s.executables = ["grift"]

data/lib/grifter/configuration.rb

@@ -1,4 +1,5 @@
 require 'yaml'
+require 'uri'
 
 require_relative 'log'
 
@@ -16,6 +17,20 @@ class Grifter
       end
     end
 
+    def get_service_config_from_url url
+      return {} if url.nil?
+      unless url =~ URI::ABS_URI
+        raise GrifterConfigurationError.new "url is not a proper aboslute URL: #{url}"
+      end
+      parsed = URI.parse url
+      {
+        :hostname => parsed.host,
+        :port => parsed.port,
+        :base_uri => parsed.path,
+        :ssl => (parsed.scheme == 'https'),
+      }
+    end
+
     def load_config_file options={}
       options = {
         config_file: ENV['GRIFTER_CONFIG_FILE'] ? ENV['GRIFTER_CONFIG_FILE'] : 'grifter.yml',
@@ -42,28 +57,17 @@ class Grifter
       #fill out services block entirely for each service
       config[:services].each_pair do |service_name, service_config|
         service_config[:name] = service_name.to_s
-       #setup port config
-       unless service_config[:port]
-         if service_config[:ssl]
-           service_config[:port] = 443
-         else
-          service_config[:port] = 80
-         end
-       end
-
-       #ssl config
-       unless service_config[:ssl]
-         service_config[:ssl] = false
-       end
-
-       #ignore_ssl_certificate
-       unless service_config[:ignore_ssl_cert]
-         service_config[:ignore_ssl_cert] = false
-       end
-
-       unless service_config[:base_uri]
-         service_config[:base_uri] = ''
-       end
+
+        #check for a url configuration option. This option will trump any others that may be set
+        service_config.merge!(get_service_config_from_url(service_config.delete(:url)))
+
+        #default everything that is not defined
+        service_config.merge!({
+          ssl: false,
+          ignore_ssl_cert: false,
+          base_uri: '',
+          port: (service_config[:ssl] == true ? 443 : 80),
+        }.merge(service_config))
 
       end
 
@@ -75,12 +79,22 @@ class Grifter
         end
 
         config[:environments][config[:environment]].each_pair do |service_name, service_overrides|
+          service_overrides.merge!(get_service_config_from_url(service_overrides.delete(:url)))
           config[:services][service_name].merge! service_overrides
         end
       else
         config[:environment] = :undefined
       end
 
+      #merge any overrides provided via a GRIFTER_<svc name>_URL environment variable
+      config[:services].each_pair do |service_name, service_config|
+        env_var_name = "GRIFTER_#{service_config[:name].upcase}_URL"
+        if ENV[env_var_name]
+          Log.warn "Environment variable #{env_var_name} is defined, using it to override configuration"
+          service_config.merge!(get_service_config_from_url(ENV[env_var_name]))
+        end
+      end
+
       #join the grift globs with the relative path to config file
       if config[:grift_globs] && options[:config_file]
         config_file_dir = File.dirname options[:config_file]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grifter
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Robert Schultheis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-07 00:00:00.000000000 Z
+date: 2013-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json