apidragon 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: acb768a3cd899d976484f3512f5980991c528119
-  data.tar.gz: 1d9fcba41c065e6b6b1c62b00aef7b69af90031f
+  metadata.gz: 76ab796cc1ebae10fc5863169dc3c3a4f5f73f83
+  data.tar.gz: a2eff6d0afb2817fd23855cdcf7943a837dce1d3
 SHA512:
-  metadata.gz: 81fc3a0bd3bef83826c3ca21c21e919e67b52c90480111585f688b92dff6fba42720d37d149115f632a2da72169ff416ab250c5d721abe7cc984a7056ed1d395
-  data.tar.gz: 58374a6e4d1740c0681ff3150624e7ff6e9e8f163e9af859e7087f75b136a47179d697b2ba0bf9ec646dbae21e5c57906df93f5a62195f202294698fb618093f
+  metadata.gz: b73ff42605b6ca031cd0eaa53bf6ca6ff8de6de87f09ca594c32610dcedfd5520dbfe96ab7b027e2ea67325736f66d221a1d7f318c0998576381bb2b7e9f6e5e
+  data.tar.gz: 481669fc952dab9f24e432f17395558ab1f58d0e6c3040f95d2e72bf9ec8adb76d6fdec4389688e17625ee610984be10e3b78411d025349d6b92c45d48bc921f

data/README.md

@@ -83,7 +83,7 @@ Further, for more specific output parsing, you can specify a qualifier variable.
 So if the call returns a list like this: `[{username => bob, id => 1234}, {username => alice, id => 5678}]`, you can always return the `id` associated with the `username` variable defined in the `vars` section.
 
 ## logging
-For each call, set `logging` to `true` to enable or `false` to disable.
+For each call, set `logging` to `true` to enable or `false` to disable. (Note: must explicitly set `logging: false` if a previous call has it set to `true`. Still trying to figure out why this is)
 
 - e.g.:
 ```yaml
@@ -106,10 +106,11 @@ Each call can refer to a plugin file. The Plugin class should follow the structu
     end  
   end  
   ```
-```yaml
-  testcall:
-    plugin: example #name of file minus .rb extension
-```
+  - apidragonconf.yaml  
+  ```yaml
+    testcall:
+      plugin: example #name of file minus .rb extension
+  ```
 
 
 # Planned Features

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.2.1

data/apidragon.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: apidragon 1.2.0 ruby lib
+# stub: apidragon 1.2.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "apidragon"
-  s.version = "1.2.0"
+  s.version = "1.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["isaiah thiessen"]
-  s.date = "2015-12-01"
+  s.date = "2015-12-02"
   s.description = "Ruby based CLI for accessing veracode's api"
   s.email = "isaiah.thiessen@live.ca"
   s.executables = ["apidragon"]
@@ -23,7 +23,6 @@ Gem::Specification.new do |s|
   s.files = [
     ".gitignore",
     "Gemfile",
-    "Gemfile.lock",
     "LICENSE.txt",
     "README.md",
     "README.rdoc",

data/lib/apidragon/api.rb

@@ -15,6 +15,7 @@ class Api < ArgBucket
   # so that they can be used as parameters for function calls.
 
   def initialize(macro_name)
+    `mkdir #{PLUGINS}` unless Dir.exist? PLUGINS
     @arg_bucket = {}
     @config = load_config
     import @config['vars']
@@ -27,8 +28,8 @@ class Api < ArgBucket
   end
 
   def go
-    @macro.each_pair do |key, value|
-      call = Call.new(value['input'], value['output'], value['mode'], value['function'], @arg_bucket, value['logging'], value['plugin'])
+    @macro.each_pair do |_key, value|
+      call = Call.new(value, @arg_bucket)
       @arg_bucket = call.run
       if !value['record'].nil?
         value['record'].each do |var|
@@ -38,10 +39,6 @@ class Api < ArgBucket
     end
   end
 
-  def rest_get_request(url, **params)
-    RestClient.get url, params: params
-  end
-
   def import(args)
     args.each_pair do |key, value|
       set key, value

data/lib/apidragon/log.rb

@@ -1,18 +1,10 @@
 class ResponseLogger
 
-  def object_log(function, code, body)
+  def object_log(code=nil, body)
     log = File.open "#{LOG}", 'a+'
     log.write "call @ #{timestamp}"
-    log.write "HTTP #{code}\n"
-    log.write body
-    log.write "\n"
-    log.close
-  end
-
-  def string_log(function, response)
-    log = File.open "#{LOG}", 'a+'
-    log.write "call @ #{timestamp}"
-    log.write response
+    log.write "HTTP #{code}\n" unless code==nil
+    log.write JSON.pretty_generate body
     log.write "\n"
     log.close
   end

data/lib/apidragon/macro.rb

@@ -4,31 +4,28 @@ require_relative 'log'
 
 class Call < ArgBucket
 
-  def initialize(input, output, mode, function, args, logging=false, plugin=nil)
+  def initialize(value, args)
     @arg_bucket = args
-    @plugin = plugin
+    @plugin = value['plugin']
     begin
-      require_relative "#{PLUGINS}#{plugin}" unless plugin.nil?
+      require_relative "#{PLUGINS}#{@plugin}" unless @plugin.nil?
     rescue LoadError
       puts 'Plugin failed to load. Custom functions will not be run.'
       @plugin = nil
     end
-    username = get 'username'
-    password = get 'password'
-    check_constraints mode, function
-    @function = function
-    credential_sub username, password
-    @mode = mode
-    @output = output
-    @input = input
-    @logging = logging
-    set_call_args unless input.nil?
+    @function = value['function']
+    credential_sub get('username'), get('password')
+    @mode = value['mode']
+    check_constraints
+    @output = value['output']
+    @logging = value['logging']
+    set_call_args value['input'] unless value['input'].nil?
   end
 
-  def check_constraints(mode, function)
-    if mode.nil? then fail '"mode" not set. syntax= mode: get/post/put/delete.' end
-    if function.nil? then fail '"function" not set. syntax= function: api-url.' end
-    puts "WARNING: 'function' should have basic auth. (example syntax= function: username:password@example.com/apicall)" unless function.include?('username') && function.include?('password') || @mode == 'eval'
+  def check_constraints
+    if @mode.nil? then fail '"mode" not set. syntax= mode: get/post/put/delete.' end
+    if @function.nil? then fail '"function" not set. syntax= function: api-url.' end
+    puts "WARNING: 'function' should have basic auth. (example syntax= function: username:password@example.com/apicall)" unless @function.include?('username') && @function.include?('password')
   end
 
   def credential_sub(username, password)
@@ -36,52 +33,32 @@ class Call < ArgBucket
     @function.gsub!('password', password) unless password.nil?
   end
 
-  def set_call_args
-    input = @input
+  def set_call_args(input)
     @input = {}
     input.each do |arg|
       value = get arg
-      if arg.nil? then puts 'WARNING: required argument not set.' end
+      if arg.nil? then puts "WARNING: required argument '#{arg}' not set." end
       @input[arg] = value
     end
   end
 
   def run
-    begin
-      case @mode
-        when 'get'
-          puts "making a get: #{@function} with #{@input}"
-          @response = RestClient.get @function, params: @input
-        when 'post'
-          puts "making a post: #{@function} with #{@input}"
-          @response = RestClient.post @function, params: @input
-        when 'put'
-          puts "making a put: #{@function} with #{@input}"
-          @response = RestClient.put @function, params: @input
-        when 'delete'
-          puts "making a delete: #{@function} with #{@input}"
-          @response = RestClient.delete @function, params: @input
-        when 'curl_get'
-          command = "curl -v --url #{@function}"
-          @input.each_pair do |key, value|
-            command << " -F #{key}='#{value}'"
-          end
-          @response = `#{command}`
-        when 'curl_post'
-          command = "curl -v -X POST --url #{@function}"
-          @input.each_pair do |key, value|
-            command << " -F #{key}='#{value}'"
-          end
-          @response = `#{command}`
-        else
-          puts "#{@mode} not supported."
-      end
-    rescue RestClient::Unauthorized
-      puts 'Username or password was invalid.'
-    rescue RestClient::Exception
-      puts 'Internal Error or requested resource was not found.'
+    case @mode
+      when 'get', 'put', 'post', 'delete'
+        rest_request
+      when 'curl_get'
+        command = "curl -v --url #{@function}"
+        curl_request command
+      when 'curl_post'
+        command = "curl -v -X POST --url #{@function}"
+        curl_request command
+        @response = `#{command}`
+      else
+        puts "#{@mode} not supported."
     end
     if !@response.nil?
+      @code = @response.code unless @response.is_a? String
+      xml_to_json
       run_plugin_script unless @plugin.nil?
       log_response unless @logging == false
       parse_response unless @output.nil?
@@ -89,30 +66,42 @@ class Call < ArgBucket
     return @arg_bucket
   end
 
-  def run_plugin_script
-    if !@response.is_a? String
-      custom = Plugin.new(@response.body).run
-    else
-      custom = Plugin.new(@response).run 
+  def curl_request(command)
+    @input.each_pair do |key, value|
+      command << " -F #{key}='#{value}'"
     end
+    @response = `#{command}`
+  end
+
+  def rest_request
+    puts "Making a #{@mode}: #{@function} with #{@input}"
+    @response = RestClient::Request.execute(method: @mode, url: @function, headers: {params: @input}) { |response, request, result, &block|
+      if [301, 302, 307].include? response.code
+        response.follow_redirection(request, result, &block)
+      else
+        response.return!(request, result, &block)
+      end
+    }
+    rescue RestClient::Unauthorized
+      puts 'Username or password was invalid.'
+    rescue RestClient::Exception
+      puts 'Internal Error or requested resource was not found.'
+  end
+
+  def run_plugin_script
+      Plugin.new(@response).run
   end
 
   def log_response
     logger = ResponseLogger.new
-    if !@response.is_a? String
-      logger.object_log @function, @response.code, @response.body
-    else
-      logger.string_log @function, @response
-    end
+    logger.object_log @code, @response
   end
 
   def xml_to_json
-    @response = Hash.from_xml(@response).to_json unless !@response.include?('<?xml')
+    @response = JSON.parse(Hash.from_xml(@response).to_json) unless !@response.include?('<?xml')
   end
 
   def parse_response
-    xml_to_json
-    @response = JSON.parse @response
     @output.each do |var|
       if var.is_a? String
         parser = Parser.new(var, nil, @response)

data/lib/apidragon/parser.rb

@@ -20,13 +20,13 @@ class Parser
       if object.has_key? @field_name
         @output = object[@field_name]
       else
-        object.each_pair do |key, value|
-          qualified_recurse value
+        object.each_pair do |_key, value|
+          recurse value
         end
       end
     elsif object.is_a? Array
       object.each do |element|
-        qualified_recurse element
+        recurse element
       end
     end
   end
@@ -36,7 +36,7 @@ class Parser
       if object.has_value? @qualifier_value
         @output = object[@field_name]
       else
-        object.each_pair do |key, value|
+        object.each_pair do |_key, value|
           qualified_recurse value
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apidragon
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - isaiah thiessen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-01 00:00:00.000000000 Z
+date: 2015-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -246,7 +246,6 @@ extra_rdoc_files:
 files:
 - ".gitignore"
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - README.rdoc

data/Gemfile.lock

@@ -1,162 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    abstract_type (0.0.7)
-    activesupport (4.2.5)
-      i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
-    adamantium (0.2.0)
-      ice_nine (~> 0.11.0)
-      memoizable (~> 0.4.0)
-    addressable (2.3.8)
-    ast (2.1.0)
-    astrolabe (1.3.1)
-      parser (~> 2.2)
-    builder (3.2.2)
-    commander (4.3.5)
-      highline (~> 1.7.2)
-    concord (0.1.5)
-      adamantium (~> 0.2.0)
-      equalizer (~> 0.0.9)
-    contracts (0.12.0)
-    descendants_tracker (0.0.4)
-      thread_safe (~> 0.3, >= 0.3.1)
-    diff-lcs (1.2.5)
-    docile (1.1.5)
-    domain_name (0.5.25)
-      unf (>= 0.0.5, < 1.0.0)
-    equalizer (0.0.11)
-    faraday (0.9.2)
-      multipart-post (>= 1.2, < 3)
-    git (1.2.9.1)
-    github_api (0.13.0)
-      addressable (~> 2.3)
-      descendants_tracker (~> 0.0.4)
-      faraday (~> 0.8, < 0.10)
-      hashie (>= 3.4)
-      multi_json (>= 1.7.5, < 2.0)
-      nokogiri (~> 1.6.6)
-      oauth2
-    hashie (3.4.3)
-    highline (1.7.8)
-    http-cookie (1.0.2)
-      domain_name (~> 0.5)
-    i18n (0.7.0)
-    ice_nine (0.11.1)
-    jeweler (2.0.1)
-      builder
-      bundler (>= 1.0)
-      git (>= 1.2.5)
-      github_api
-      highline (>= 1.6.15)
-      nokogiri (>= 1.5.10)
-      rake
-      rdoc
-    json (1.8.3)
-    jwt (1.5.2)
-    memoizable (0.4.2)
-      thread_safe (~> 0.3, >= 0.3.1)
-    mime-types (2.99)
-    mini_portile (0.6.2)
-    minitest (5.8.3)
-    multi_json (1.11.2)
-    multi_xml (0.5.5)
-    multipart-post (2.0.0)
-    netrc (0.11.0)
-    nokogiri (1.6.6.4)
-      mini_portile (~> 0.6.0)
-    oauth2 (1.0.0)
-      faraday (>= 0.8, < 0.10)
-      jwt (~> 1.0)
-      multi_json (~> 1.3)
-      multi_xml (~> 0.5)
-      rack (~> 1.2)
-    parser (2.2.3.0)
-      ast (>= 1.1, < 3.0)
-    powerpack (0.1.1)
-    procto (0.0.2)
-    rack (1.6.4)
-    rainbow (2.0.0)
-    rake (10.4.2)
-    rdoc (3.12.2)
-      json (~> 1.4)
-    reek (1.6.6)
-      parser (~> 2.2.0.pre.7)
-      rainbow (>= 1.99, < 3.0)
-      unparser (~> 0.2.2)
-    rest-client (1.8.0)
-      http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 3.0)
-      netrc (~> 0.7)
-    roodi (2.2.0)
-      ruby_parser (~> 2.3.0)
-    rubocop (0.35.1)
-      astrolabe (~> 1.3)
-      parser (>= 2.2.3.0, < 3.0)
-      powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
-      ruby-progressbar (~> 1.7)
-      tins (<= 1.6.0)
-    ruby-progressbar (1.7.5)
-    ruby_parser (2.3.1)
-      sexp_processor (~> 3.0)
-    settingslogic (2.0.9)
-    sexp_processor (3.2.0)
-    shoulda (3.5.0)
-      shoulda-context (~> 1.0, >= 1.0.1)
-      shoulda-matchers (>= 1.4.1, < 3.0)
-    shoulda-context (1.2.1)
-    shoulda-matchers (2.8.0)
-      activesupport (>= 3.0.0)
-    simplecov (0.10.0)
-      docile (~> 1.1.0)
-      json (~> 1.8)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
-    terminal-announce (1.0.0)
-      bundler
-      contracts
-      rainbow
-    thread_safe (0.3.5)
-    tins (1.6.0)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.7.1)
-    unparser (0.2.4)
-      abstract_type (~> 0.0.7)
-      adamantium (~> 0.2.0)
-      concord (~> 0.1.5)
-      diff-lcs (~> 1.2.5)
-      equalizer (~> 0.0.9)
-      parser (~> 2.2.2)
-      procto (~> 0.0.2)
-    yard (0.8.7.6)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activesupport (~> 4.2)
-  bundler (~> 1.0)
-  commander (~> 4.3)
-  jeweler (~> 2.0)
-  json (~> 1.8)
-  nokogiri (~> 1.6)
-  rdoc (~> 3.12)
-  reek (~> 1.2)
-  rest-client (~> 1.8)
-  roodi (~> 2.1)
-  rubocop (~> 0.32)
-  settingslogic (~> 2.0)
-  shoulda (~> 3.5)
-  simplecov (~> 0.10)
-  terminal-announce (~> 1.0)
-  yard (~> 0.7)
-
-BUNDLED WITH
-   1.10.6