grifter 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f65192478a13844ee1baa9e2b14e643fcf90bf8d
-  data.tar.gz: 0c77141f8d51cd0e8c7acfcbe1e46989140a5be5
+  metadata.gz: 7caca66795a8e7c7d541699b139a092f62023823
+  data.tar.gz: fdcd5c5a4a2330b8642b9d98fc2ba10bfe2f48f7
 SHA512:
-  metadata.gz: 58e0aa61a159be1e07c07e277cdf45c1c9a492a8bb5b849e1c7595d9e500c0604d12cac1d45594861aef7d96e0fec3000d53c065ccf701338cbfa1d76561d4ba
-  data.tar.gz: be2d539d498b1236908331f6eef91c9005079f546181e12cffb1a851095af7eb328edf674d945a87821dccbc3b953cc1bf5e328fa416b06c49b55f74dde767bf
+  metadata.gz: 714c56a06fae7b392b6f147723afbb08ade3785740d13801492fae1c8638186f3c9db7d21360d293d7ed2a70ce19919d93d7c98426dd9c3b7ca5868823facc88
+  data.tar.gz: b9b4f9340ca6e434a52aac9d5d149e08e256f9268ab518003e43602fcf0ba12c0fca55bb64a6c25708d09fe8d282fd91e32ac09079214b5283a5920cfb0846bf

data/Gemfile

@@ -1,10 +1,9 @@
-source :rubygems
-
-#gemspec
+source 'https://rubygems.org'
 
 gem 'faraday', '0.9.0'
 gem 'json'
 gem 'typhoeus', '0.6.4'
+gem 'activesupport', '4.0.3'
 
 group :development do
   gem 'rspec'

data/Gemfile.lock

@@ -1,7 +1,14 @@
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
+    activesupport (4.0.3)
+      i18n (~> 0.6, >= 0.6.4)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
     addressable (2.3.5)
+    atomic (1.1.16)
     awesome_print (1.2.0)
     builder (3.2.2)
     coderay (1.1.0)
@@ -24,6 +31,7 @@ GEM
       oauth2
     hashie (2.0.5)
     highline (1.6.20)
+    i18n (0.6.9)
     jeweler (2.0.0)
       builder
       bundler (>= 1.0)
@@ -39,6 +47,7 @@ GEM
     method_source (0.8.2)
     mime-types (1.25.1)
     mini_portile (0.5.2)
+    minitest (4.7.5)
     multi_json (1.8.4)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
@@ -67,13 +76,17 @@ GEM
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.4)
     slop (3.4.7)
+    thread_safe (0.3.1)
+      atomic (>= 1.1.7, < 2)
     typhoeus (0.6.4)
       ethon (~> 0.6.0)
+    tzinfo (0.3.39)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  activesupport (= 4.0.3)
   awesome_print
   faraday (= 0.9.0)
   jeweler

data/Readme.md

@@ -1,35 +1,20 @@
 Grifter
 =======
-Grifter makes it smooth to work with JSON HTTP APIs with confidence
-
-Intro
---------
-Grifter allows creating a DSL for working with any HTTP JSON RESTy API.
-You can GET, POST and otherwise interact with any set of APIs through
-high level methods you define, allowing your code to ignore all the
-details around the mechanics of connecting to the API, executing the
-request, and turning JSON into native ruby objects.
-
-Using grifter gets you for free:
-- a cmd line interface for your json http apis
-- a ruby scripting language for interacting with your json http apis
-- An object you can use in any kind of ruby program for easily sending
-  API requests
-- An RSpec Helper that makes testing Rest APIs painless
-
-Grifter relies heavily on the 'convention over configuration' approach,
-which means for less code, you get more.
-
-
-Features
---------
-- Work with multiple APIs
-- Work with multiple deployment environments (Staging, Production, etc.)
-- Script calls to API(s)
-- Command line calls to API(s)
-- Craft clean API tests using the included RSPec helper
-- Unified approach to handling request errors
-- Convention over configuration approach to defining the API interface
+Do cool stuff with HTTP JSON APIs.  Designed for the real world of developing systems based on service-oriented-architecture.
+
+What is Grifter?
+----------------
+Grifter is primarily designed to be used by software teams that build HTTP JSON services.
+Grifter makes it easy to:
+* Define "macro" methods that accomplish high level goals through service calls.
+* Call services or macro methods from the command line, adhoc scripts, or programtically within any Ruby program.
+* Test services using RSpec or other testing frameworks
+* "Point" at different environments (eg. QA, Staging, Production)
+
+Grifter relies heavily on the 'convention over configuration' approach.  For very little code, you
+get a lot of functionality.
+
+Grifter is based on [Faraday](https://github.com/lostisland/faraday), thus there is basic support for making requests concurrently, and for swapping out the HTTP "adapter".
 
 Getting Started
 ---------------
@@ -133,7 +118,12 @@ And get back:
     1 example, 0 failures
 
 
+Further Information
+-------------------
+
+Checkout out the [Wiki](https://github.com/Knewton/grifter/wiki) for info on configuration, authentication, and more.
+
+
 Copyright
 ---------
-Copyright (c) 2013 Knewton. See LICENSE.txt for
-further details.
+Copyright (c) 2013 Knewton. See LICENSE.txt for further details.

data/grifter.gemspec

@@ -2,14 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: grifter 0.4.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "grifter"
-  s.version = "0.3.2"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
   s.authors = ["Robert Schultheis"]
-  s.date = "2014-01-26"
+  s.date = "2014-03-24"
   s.description = "convention based approach to interfacing with an HTTP JSON API."
   s.email = "rob@knewton.com"
   s.executables = ["grift"]
@@ -34,8 +36,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/knewton/grifter"
   s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "2.0.3"
+  s.rubygems_version = "2.2.0"
   s.summary = "Make calls to HTTP JSON APIs with ease and confidence"
 
   if s.respond_to? :specification_version then
@@ -45,6 +46,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<faraday>, ["= 0.9.0"])
       s.add_runtime_dependency(%q<json>, [">= 0"])
       s.add_runtime_dependency(%q<typhoeus>, ["= 0.6.4"])
+      s.add_runtime_dependency(%q<activesupport>, ["= 4.0.3"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<pry>, [">= 0"])
       s.add_development_dependency(%q<awesome_print>, [">= 0"])
@@ -53,6 +55,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<faraday>, ["= 0.9.0"])
       s.add_dependency(%q<json>, [">= 0"])
       s.add_dependency(%q<typhoeus>, ["= 0.6.4"])
+      s.add_dependency(%q<activesupport>, ["= 4.0.3"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<pry>, [">= 0"])
       s.add_dependency(%q<awesome_print>, [">= 0"])
@@ -62,6 +65,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<faraday>, ["= 0.9.0"])
     s.add_dependency(%q<json>, [">= 0"])
     s.add_dependency(%q<typhoeus>, ["= 0.6.4"])
+    s.add_dependency(%q<activesupport>, ["= 4.0.3"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<pry>, [">= 0"])
     s.add_dependency(%q<awesome_print>, [">= 0"])

data/lib/grifter.rb

@@ -8,16 +8,18 @@ class Grifter
   include Grifter::Configuration
   include Grifter::Instrumentation
 
-  DefaultConfigOptions = {
-    #TODO: service_config: nil,
-    grift_globs: ['*_grifts/**/*_grifts.rb'],
-    authenticate: false,
-    load_from_config_file: true,
-    services: {},
-    instrumentation: false,
-  }
+  def default_options
+    {
+      grift_globs: ['*_grifts/**/*_grifts.rb'],
+      authenticate: false,
+      load_from_config_file: true,
+      services: {},
+      instrumentation: false,
+    }
+  end
+
   def initialize options={}
-    options = DefaultConfigOptions.merge(options)
+    options = default_options.merge(options)
     @config = if options[:load_from_config_file]
                 options.merge load_config_file(options)
               else
@@ -86,7 +88,7 @@ class Grifter
     end
   end
 
-private
+  private
   def with_local_load_path load_path, &block
     $: << load_path
     rtn = yield block

data/lib/grifter/configuration.rb

@@ -101,10 +101,12 @@ class Grifter
         service_config[:faraday_url] = "#{service_config[:ssl] ? 'https':'http'}://#{service_config[:hostname]}:#{service_config[:port].to_s}"
       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]
-        config[:grift_globs].map! {|glob| config_file_dir + '/' + glob.sub(/^\//,'')}
+      #setup the grift globs, and this seems more sloppy than it should be
+      glob_base_dir = options[:config_file] ? File.dirname(options[:config_file]) : Dir.pwd
+      glob_base_dir = File.expand_path(glob_base_dir)
+      config[:grift_globs] ||= options[:grift_globs]
+      if config[:grift_globs]
+        config[:grift_globs].map! {|glob| glob_base_dir + '/' + glob.sub(/^\//,'')}
       end
 
       return config

data/lib/grifter/http_service.rb

@@ -1,7 +1,8 @@
 require 'faraday'
 require 'typhoeus'
 require 'typhoeus/adapters/faraday' #https://github.com/typhoeus/typhoeus/issues/226#issuecomment-9919517
-#Faraday.require_libs 'parameters'
+require 'active_support/notifications'
+require 'securerandom'
 
 require_relative 'json_helpers'
 require_relative 'log'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grifter
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Robert Schultheis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-26 00:00:00.000000000 Z
+date: 2014-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -28,14 +28,14 @@ dependencies:
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -52,60 +52,74 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.6.4
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 4.0.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 4.0.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: convention based approach to interfacing with an HTTP JSON API.
@@ -140,17 +154,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Make calls to HTTP JSON APIs with ease and confidence