response_mate 0.1.14 → 0.2.0

data/.gitignore

@@ -7,6 +7,9 @@ tmp
 .rvmrc
 .rbenv*
 
+spec/source/responses
+spec/source/responses.last_recording
+
 output
 oauth.yml
 

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--format documentation

data/Gemfile

@@ -3,3 +3,15 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'coveralls', require: false
+
+group :development, :test do
+  gem 'pry-debugger'
+  gem 'guard-rspec', require: false
+  gem 'guard-rubocop', require: false
+end
+
+group :test do
+  gem 'rspec', '~> 2.14.0'
+  gem 'simplecov', '~> 0.8.2'
+  gem 'fakeweb', '~> 1.2.8'
+end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    response_mate (0.1.13)
+    response_mate (0.2.0)
       activesupport
       addressable
       awesome_print
@@ -10,86 +10,120 @@ PATH
       faraday_middleware
       highline
       mustache
-      thor (~> 0.18.1)
+      thor (~> 0.19)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.0.2)
-      i18n (~> 0.6, >= 0.6.4)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
+    activesupport (4.1.4)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
       thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    addressable (2.3.5)
-    ast (1.1.0)
-    atomic (1.1.14)
+      tzinfo (~> 1.1)
+    addressable (2.3.6)
+    ast (2.0.0)
     awesome_print (1.2.0)
-    coderay (1.0.9)
+    celluloid (0.15.2)
+      timers (~> 1.1.0)
+    coderay (1.1.0)
     colored (1.2)
+    columnize (0.8.9)
     coveralls (0.7.0)
       multi_json (~> 1.3)
       rest-client
       simplecov (>= 0.7)
       term-ansicolor
       thor
+    debugger (1.6.6)
+      columnize (>= 0.3.1)
+      debugger-linecache (~> 1.2.0)
+      debugger-ruby_core_source (~> 1.3.2)
+    debugger-linecache (1.2.0)
+    debugger-ruby_core_source (1.3.5)
     diff-lcs (1.2.5)
     docile (1.1.1)
     fakefs (0.4.3)
-    faraday (0.8.9)
-      multipart-post (~> 1.2.0)
-    faraday_middleware (0.9.0)
-      faraday (>= 0.7.4, < 0.9)
-    highline (1.6.20)
+    fakeweb (1.2.8)
+    faraday (0.9.0)
+      multipart-post (>= 1.2, < 3)
+    faraday_middleware (0.9.1)
+      faraday (>= 0.7.4, < 0.10)
+    ffi (1.9.3)
+    formatador (0.2.4)
+    guard (2.6.1)
+      formatador (>= 0.2.4)
+      listen (~> 2.7)
+      lumberjack (~> 1.0)
+      pry (>= 0.9.12)
+      thor (>= 0.18.1)
+    guard-rspec (4.2.9)
+      guard (~> 2.1)
+      rspec (>= 2.14, < 4.0)
+    guard-rubocop (1.1.0)
+      guard (~> 2.0)
+      rubocop (~> 0.20)
+    highline (1.6.21)
     i18n (0.6.9)
+    json (1.8.1)
+    listen (2.7.5)
+      celluloid (>= 0.15.2)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+    lumberjack (1.0.5)
     method_source (0.8.2)
     mime-types (2.0)
-    minitest (4.7.5)
+    minitest (5.3.5)
     multi_json (1.8.2)
-    multipart-post (1.2.0)
+    multipart-post (2.0.0)
     mustache (0.99.5)
-    parser (2.1.1)
-      ast (~> 1.1)
+    parser (2.1.9)
+      ast (>= 1.1, < 3.0)
       slop (~> 3.4, >= 3.4.5)
     powerpack (0.0.9)
-    pry (0.9.12.2)
-      coderay (~> 1.0.5)
+    pry (0.9.12.6)
+      coderay (~> 1.0)
       method_source (~> 0.8)
       slop (~> 3.4)
-    pry-nav (0.2.3)
+    pry-debugger (0.2.2)
+      debugger (~> 1.3)
       pry (~> 0.9.10)
-    pry-remote (0.1.7)
-      pry (~> 0.9)
-      slop (~> 3.0)
-    rainbow (1.99.0)
+    rainbow (2.0.0)
     rake (10.1.0)
+    rb-fsevent (0.9.4)
+    rb-inotify (0.9.4)
+      ffi (>= 0.5.0)
     rest-client (1.6.7)
       mime-types (>= 1.16)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.7)
-    rspec-expectations (2.14.4)
+    rspec-core (2.14.8)
+    rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.4)
-    rubocop (0.16.0)
-      parser (~> 2.1)
+    rspec-mocks (2.14.6)
+    rubocop (0.23.0)
+      json (>= 1.7.7, < 2)
+      parser (~> 2.1.9)
       powerpack (~> 0.0.6)
-      rainbow (>= 1.1.4)
+      rainbow (>= 1.99.1, < 3.0)
+      ruby-progressbar (~> 1.4)
+    ruby-progressbar (1.5.1)
     simplecov (0.8.2)
       docile (~> 1.1.0)
       multi_json
       simplecov-html (~> 0.8.0)
     simplecov-html (0.8.0)
-    slop (3.4.6)
+    slop (3.5.0)
     term-ansicolor (1.2.2)
       tins (~> 0.8)
-    thor (0.18.1)
-    thread_safe (0.1.3)
-      atomic
+    thor (0.19.1)
+    thread_safe (0.3.4)
+    timers (1.1.0)
     tins (0.13.1)
-    tzinfo (0.3.38)
+    tzinfo (1.2.1)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby
@@ -98,10 +132,11 @@ DEPENDENCIES
   bundler (~> 1.3)
   coveralls
   fakefs
-  pry
-  pry-nav
-  pry-remote
+  fakeweb (~> 1.2.8)
+  guard-rspec
+  guard-rubocop
+  pry-debugger
   rake
   response_mate!
-  rspec (~> 2.14)
-  rubocop
+  rspec (~> 2.14.0)
+  simplecov (~> 0.8.2)

data/Guardfile

@@ -0,0 +1,16 @@
+rspec_options = {
+  cmd: "bundle exec rspec --order rand"
+}
+
+guard 'rspec', rspec_options do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$}) { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb') { "spec" }
+
+  watch(%r{^app/(.+)\.rb$}) { |m| "spec/#{m[1]}_spec.rb" }
+end
+
+#guard :rubocop, all_on_start: false do
+  #watch(%r{.+\.rb$})
+  #watch(%r{(?:.+/)?\.rubocop\.yml$}) { |m| File.dirname(m[0])  }
+#end

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2012 Dimitris Zorbas / zorbash
+Copyright 2014 Dimitris Zorbas / zorbash
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -9,4 +9,4 @@ RSpec::Core::RakeTask.new(:test) do |spec|
   spec.rspec_opts = ['--color', '--format nested']
 end
 
-task :default => :test
+task default: :test

data/bin/response_mate

@@ -3,4 +3,12 @@
 
 require 'response_mate'
 
-ResponseMate::CLI.start(ARGV)
+begin
+  ResponseMate::CLI.start(ARGV)
+rescue ResponseMate::OutputDirError
+  puts <<-OUT
+  Output directory does not exist, invoking setup..
+  Please retry after setup
+  OUT
+  ResponseMate::CLI.start(['setup'])
+end

data/lib/response_mate/cli.rb

@@ -5,23 +5,17 @@ module ResponseMate
     package_name 'response_mate'
 
     desc 'record', 'Perform requests and record their output'
-    method_option :base_url, aliases: '-b'
     method_option :requests_manifest, aliases: '-r'
-    method_option :keys, aliases: '-k', type: :array
+    method_option :keys, aliases: '-k', type: :array, default: []
     def record
       ResponseMate::Commands::Record.new(args, options).run
-
-    rescue ResponseMate::OutputDirError
-      puts 'Output directory does not exist, invoking setup..'
-      puts 'Please retry after setup'
-      invoke :setup, []
+    rescue ResponseMate::KeysNotFound => e
+      puts "The requested keys: #{e.message} could not be found"
     end
 
     desc 'inspect [key1,key2]', 'Perform requests and print their output'
-    method_option :base_url, aliases: '-b'
     method_option :requests_manifest, aliases: '-r'
-    method_option :interactive, type: :boolean, aliases: "-i"
-    method_option :print, type: :string, aliases: '-p', default: 'raw'
+    method_option :interactive, type: :boolean, aliases: '-i'
     def inspect(*keys)
       ResponseMate::Commands::Inspect.new(args, options).run
     end
@@ -41,16 +35,11 @@ module ResponseMate
     method_option :requests_manifest, aliases: '-r'
     def list(type = 'requests')
       ResponseMate::Commands::List.new(args, options).run
-
-    rescue ResponseMate::OutputDirError
-      puts 'Output directory does not exist, invoking setup..'
-      puts 'Please retry after setup'
-      invoke :setup, []
     end
 
     desc 'version', 'Print version information'
     def version
-      puts "ResponseMate version #{ResponseMate::VERSION}"
+      puts "response_mate version #{ResponseMate::VERSION}"
     end
     map ['--version'] => :version
 

data/lib/response_mate/commands/inspect.rb

@@ -1,44 +1,24 @@
 # coding: utf-8
 
-module ResponseMate
-  module Commands
-    class ResponseMate::Commands::Inspect < Base
-      attr_reader :inspector
-      attr_accessor :history
+class ResponseMate::Commands::Inspect < ResponseMate::Commands::Base
+  attr_reader :inspector
+  attr_accessor :history
 
-      def initialize(args, options)
-        super(args, options)
+  def initialize(args, options)
+    super(args, options)
 
-        @options[:manifest] = ResponseMate::Manifest.new(options[:requests_manifest])
-        @inspector = ResponseMate::Inspector.new(@options)
-        @history = []
-      end
+    @options[:manifest] = ResponseMate::Manifest.new(options[:requests_manifest])
+    @inspector = ResponseMate::Inspector.new(@options)
+    @history = []
+  end
 
-      def run
-        if options[:interactive]
-          interactive
-        else
-          args.each do |key|
-            inspector.inspect_key(key)
-          end
-        end
-      end
+  def run
+    if args.empty?
+      return $stderr.puts 'At least one key has to be specified'.red
+    end
 
-      def interactive
-        loop do
-          input = ask('response_mate> ')
-          case input
-          when 'history'
-            input = choose { |menu|
-              menu.prompt = 'Replay any?'
-              menu.choices(*([:no] + history))
-            }.to_s
-          else
-            history << input
-          end
-          inspector.inspect_interactive(input)
-        end
-      end
+    args.each do |key|
+      inspector.inspect_key(key)
     end
   end
 end

data/lib/response_mate/commands/list.rb

@@ -1,52 +1,41 @@
 # coding: utf-8
+class ResponseMate::Commands::List < ResponseMate::Commands::Base
+  def run
+    environment = ResponseMate::Environment.new(options[:environment])
+    @manifest = ResponseMate::Manifest.new(options[:requests_manifest], environment)
 
-module ResponseMate
-  module Commands
-    class ResponseMate::Commands::List < Base
-      attr_accessor :type
-
-      def initialize(args, options)
-        super(args, options)
-        @type = args.first || 'requests'
-
-        environment = ResponseMate::Environment.new(options[:environment])
-        @options[:manifest] = ResponseMate::Manifest.new(options[:requests_manifest],
-          environment)
-      end
-
-      def run
-        if type == 'requests'
-          choices = options[:manifest].requests.map { |r| r.key.to_sym }
-        elsif type == 'recordings'
-          choices = Dir.glob('output/responses/*.yml').map do |f|
-            File.basename(f).gsub(/\.yml/, '').to_sym
-          end
-        end
-
-        puts choices.join "\n"
-        puts "\n\n"
-        action = choose { |menu|
-          menu.prompt = 'Want to perform any of the actions above?'
-          menu.choices(:record, :inspect, :no)
-        }
-
-        unless action == :no
-          key = choose { |menu|
-            menu.prompt = 'Which one?'
-            menu.choices(*choices)
-          }.to_s
-        end
-
-        if key
-          case action
-          when :record
-            ResponseMate::Recorder.new({ manifest: options[:manifest], keys: [key] }).
-              record
-          when :inspect
-            ResponseMate::Inspector.new(manifest: options[:manifest]).inspect_key(key)
-          end
-        end
-      end
+    available_keys = @manifest.requests.map { |r| r.key.to_sym }
+
+    puts available_keys.join("\n") << "\n\n"
+
+    action = ask_action
+    return if action == :no
+
+    perform_action(action, ask_key(available_keys))
+  end
+
+  private
+
+  def ask_action
+    choose do |menu|
+      menu.prompt = 'Want to perform any of the actions above?'
+      menu.choices(:record, :inspect, :no)
+    end
+  end
+
+  def ask_key(available_keys)
+    choose { |menu|
+      menu.prompt = 'Which one?'
+      menu.choices(*available_keys)
+    }.to_s
+  end
+
+  def perform_action(action, key)
+    case action
+    when :record
+      ResponseMate::Recorder.new(manifest: @manifest).record([key])
+    when :inspect
+      ResponseMate::Inspector.new(manifest: @manifest).inspect_key(key)
     end
   end
 end

data/lib/response_mate/commands/record.rb

@@ -3,22 +3,15 @@
 module ResponseMate
   module Commands
     # Handles the invocation of the record command
-    class ResponseMate::Commands::Record < Base
-      def initialize(args, options)
-        super(args, options)
-        @options = options.dup
-      end
-
+    class Record < Base
       def run
         environment = ResponseMate::Environment.new(options[:environment])
-
-        manifest = ResponseMate::Manifest.
-          new(options[:requests_manifest], environment)
+        manifest = ResponseMate::Manifest.new(options[:requests_manifest], environment)
 
         options[:manifest] = manifest
         recorder = ResponseMate::Recorder.new(options)
 
-        recorder.record
+        recorder.record(options[:keys])
 
         File.open(ResponseMate.configuration.output_dir + '.last_recording', 'w') do |f|
           f << Time.current

data/lib/response_mate/connection.rb

@@ -2,40 +2,33 @@
 
 # This class provides a layer above the HTTP client
 class ResponseMate::Connection
-
   delegate :params, to: :client
   delegate(*(ResponseMate::ManifestParser::HTTP_VERBS), to: :client)
 
-  attr_accessor :client, :base_url
+  attr_accessor :client
 
-  def initialize(base_url = nil)
-    @base_url = base_url
+  def initialize
     @client = Faraday.new do |c|
       c.use FaradayMiddleware::FollowRedirects, limit: 5
       c.adapter Faraday.default_adapter
     end
-
-    client.headers.merge(ResponseMate::DEFAULT_HEADERS)
-    client.url_prefix = base_url if base_url
   end
 
   def fetch(request)
-    client.params = request[:params] if !request[:params].nil?
-    unless base_url || request[:path] =~ %r{http://}
-      request[:path] = 'http://' + request[:path]
+    uri = URI.parse(request[:url])
+
+    if request[:params]
+      query = request[:params].to_query
+      query = uri.query ? uri.query << '&' << query : query
+      uri.query = query
     end
-    client.send request[:verb].downcase.to_sym, "#{base_url}#{request[:path]}"
+
+    verb = request[:verb] || 'GET'
+
+    client.headers = request[:headers] if request[:headers]
+    client.send verb.downcase.to_sym, uri.to_s
   rescue Faraday::Error::ConnectionFailed
     puts "Is a server up and running at #{request[:path]}?".red
     exit 1
   end
-
-  def set_headers_from_manifest(manifest)
-    if manifest.default_headers
-      manifest.default_headers.each_pair do |k, v|
-
-        client.headers[ResponseMate::Helpers.headerize(k)] = v
-      end
-    end
-  end
 end

data/lib/response_mate/core.rb

@@ -1,7 +1,8 @@
 # coding: utf-8
-# The main module of the tool contains configuration code and some constats
+# The main module of the tool contains configuration code and some constants
 module ResponseMate
   class OutputDirError < StandardError; end
+  class KeysNotFound < StandardError; end
 
   DEFAULT_HEADERS = {
     'User-Agent' => 'Response-Mate'
@@ -12,12 +13,11 @@ module ResponseMate
   end
 
   class Configuration
-    attr_accessor :output_dir, :requests_manifest, :oauth_manifest, :environment
+    attr_accessor :output_dir, :requests_manifest, :environment
 
     def initialize
       @output_dir = './output/responses/'
       @requests_manifest = './requests.yml'
-      @oauth_manifest = './oauth.yml'
       @environment = './environment.yml'
     end
   end

data/lib/response_mate/environment.rb

@@ -19,6 +19,6 @@ class ResponseMate::Environment
       exit 1
     end
 
-    @env = YAML.load(environment_text)
+    @env = ::YAML.load(environment_text)
   end
 end

data/lib/response_mate/inspector.rb

@@ -1,56 +1,24 @@
 # coding: utf-8
 
 class ResponseMate::Inspector
-  attr_accessor :conn, :base_url, :oauth, :manifest, :print_type
+  attr_accessor :conn, :manifest
 
   def initialize(args = {})
     @manifest = args[:manifest]
-    @oauth = ResponseMate::Oauth.new
-    @base_url = args[:base_url] || manifest.base_url
-    @print_type = args[:print] || 'raw'
 
-    if !args[:interactive]
-      @conn = ResponseMate::Connection.new(base_url)
-      @conn.set_headers_from_manifest(manifest)
-    else
-      @conn = ResponseMate::Connection.new
-    end
+    @conn = ResponseMate::Connection.new
   end
 
   def inspect_key(key, options = {})
     request = manifest.requests.find { |r| r.key == key }
-    request = ResponseMate::Manifest.parse_request(request.request)
 
-    puts "[#{key}] #{request[:verb]}".cyan_on_black.bold <<  " #{request[:path]}"
-    puts "\tparams #{request[:params]}" if request[:params].present?
-
-    print(conn.fetch(request))
-  end
-
-  def inspect_interactive(input)
-    request = ResponseMate::Manifest.parse_request(input)
-    print(conn.fetch(request))
-  end
-
-  def print(response)
-    __send__ "print_#{print_type}", response
-  end
-
-  def print_raw(response)
-    puts "\n"
-    status = "#{response.status} #{ResponseMate::Http::STATUS_CODES[response.status]}"
-    puts "HTTP/1.1 #{status}"
-    response.headers.each_pair do |k, v|
-      puts "#{ResponseMate::Helpers.headerize(k)}: #{v}"
-    end
-    puts response.body
+    puts request.to_cli_format
+    print_pretty(conn.fetch(request))
   end
 
   def print_pretty(response)
-    ap(
-      status: response.status,
-      headers: response.headers,
-      body: response.body
-    )
+    ap(status: response.status,
+       headers: response.headers,
+       body: response.body)
   end
 end