apidragon 1.4.6 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 596bb96c65ed9bbfcccc2003662443147d9346e4
-  data.tar.gz: 4dfa61084e4c32fb25fd7207938673ce905c3463
+  metadata.gz: 1e0f39b383c33aa089b2dfec841bb0c1fbccab02
+  data.tar.gz: 722bb336398f57a3aa589ead8134b657a2981c2d
 SHA512:
-  metadata.gz: cc58de1f39c0314fd3668a0e1b74421bf4784156d0f6a9aea5007d19b63396246ebfe399373cf5717860fc02d3ed31705005a40c654fdac9d14349718c35723b
-  data.tar.gz: 25ccf6a2c14cc602343a00a557a640561a74e5ae459cd38ed9729e5438a84781acc02e0dde3f29efb9264c955d06b50d1e5586b3cd9211b0eb9767e0bd64d2cc
+  metadata.gz: 933e6b5c0377f74690915af568f781f2f2891f10b6ee367d869e318444c7421fcaaf0aa5402999f26d48d68ba792bfc1797658b743753d661f45d2f36f0a08f2
+  data.tar.gz: 64b0793f3aa9c7475391e9f58384c07dfd687d957c6264e9c3258be213f1c9bedfc9942370eaf4264d3239978616136be0d423ca15861af99b3e2db1a099ea8e

data/README.md

@@ -17,6 +17,8 @@ These classes run a sequence of API calls using a configuration file.
 `[command]` is the name of one of the `macros` defined in the config file. So if I was using the config in the example,  
 I could run `apidragon do macro_1`, which would then call `testcall` and `testcall2` in the order specified.
 - You can specify your own config file path by running `apidragon do [command] --config [filepath]`
+- You can specify you password or username from the command line with `apidragon do [command] --username [username] --password [password]` (recommended if you don't want to store credentials in a file)
+
 # Configuration:
 Create `/tmp/apidragonconf.yaml`. It can contain any variables you need to access the API you are using, as well as `macros`.  
 - Example config:
@@ -99,6 +101,14 @@ Evaluates the given line of ruby code through `eval()`.
 
 # Further Options
 
+## stdout
+Setting `stdout: true` for any call will ouput its response to STDOUT. Defaults to false.
+- e.g.:
+```yaml
+  testcall:
+    stdout: true
+```
+
 ## record
 Each call can have a `record` option, where you can specify what output variables you want to record to your config.  
 

data/VERSION

@@ -1 +1 @@
-1.4.6
+1.5.0

data/bin/apidragon

@@ -1,12 +1,12 @@
 #!/usr/bin/env ruby
 
 require 'commander'
-require 'apidragon'
+#require 'apidragon'
 require_relative '../lib/apidragon.rb'
 
 Commander.configure do
   program :name, 'apidragon'
-  program :version, '1.4.5'
+  program :version, '1.5.0'
   program :description, 'CLI for automating api requests'
   program :help, 'Author', 'Isaiah Thiessen <isaiah.thiessen@telus.com>'
 
@@ -14,8 +14,10 @@ Commander.configure do
     c.syntax = 'apidragon do [options]'
     c.description = 'Run "apidragon do [command]" to run the specified "command" defined in the config file.'
     c.option '--config STRING', String, 'config file path'
+    c.option '--username STRING', String, 'pass your api username as an option'
+    c.option '--password STRING', String, 'pass your api password as an option'
     c.action do |args, options|
-      api = Api.new args.first, options.config
+      api = Api.new args.first, options.config, options.username, options.password
       api.go
     end
   end

data/lib/apidragon/api.rb

@@ -14,10 +14,12 @@ class Api < ArgBucket
   # All variables are dumped into a variable bucket (@arg_bucket)
   # so that they can be used as parameters for function calls.
 
-  def initialize(macro_name, config)
+  def initialize(macro_name, config, username, password)
     @config_file = config
     `mkdir #{PLUGINS}` unless Dir.exist? PLUGINS
     @arg_bucket = {}
+    set 'username', username unless username.nil?
+    set 'password', password unless password.nil?
     @config = load_config @config_file
     import @config['vars']
     @macro = @config['macros'][macro_name]
@@ -35,7 +37,7 @@ class Api < ArgBucket
       @arg_bucket = call.run
       if !value['record'].nil?
         value['record'].each do |var|
-          add_config_var var, get(var)
+          add_config_var var, get(var) unless var=='function'
         end
       end
     end

data/lib/apidragon/macro.rb

@@ -19,6 +19,7 @@ class Call < ArgBucket
     check_constraints
     @output = value['output']
     @logging = value['logging']
+    @stdout = value['stdout']
     set_call_args value['input'] unless value['input'].nil?
   end
 
@@ -61,7 +62,7 @@ class Call < ArgBucket
       @code = @response.code unless @response.is_a? String
       xml_to_json
       run_plugin_script unless @plugin.nil?
-      log_response unless @logging == false
+      log_response unless @logging == 'true'
       parse_response unless @output.nil?
     end
     return @arg_bucket
@@ -104,6 +105,7 @@ class Call < ArgBucket
 
   def parse_response
     @response = JSON.parse @response
+    if @stdout==true then puts JSON.pretty_generate @response end
     @output.each do |var|
       if var.is_a? String
         parser = Parser.new(var, nil, @response)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apidragon
 version: !ruby/object:Gem::Version
-  version: 1.4.6
+  version: 1.5.0
 platform: ruby
 authors:
 - isaiah thiessen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-11 00:00:00.000000000 Z
+date: 2015-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport