apidragon 1.6.1 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e41e5bc988ba884ab696631671492e85beddb8b3
-  data.tar.gz: dcb43d245c59ba67b6e4b5f2a6e1c4761ad98832
+  metadata.gz: 0d574a6823e741959e5a118293c024bda6976c10
+  data.tar.gz: 1f2837d48a7f9efde33b6f54fe7a6701df30ff92
 SHA512:
-  metadata.gz: 3d74f475d60f93280196660b1316927829bd8ea530b56420f33a8b91f1e42ea05ebab38878ba36e02cf805a0b9f97c1c776b6841521d252300466de0dd997bd5
-  data.tar.gz: bc96085bbcbd1a2285b00d66022d613c4fdce1350a6a175e582aebb928c589ad3bd0119aeae03c5e815cd2cba900f9dd8f6ce3354aea2547e804bc73c04ee2df
+  metadata.gz: bdf123732451aa9f62564945a9140f43824c04162da3a0369e5d14c62e9ed9daa94584e83bcefa577648904738fe425af990295fc0bb8dc0a10eb0885559485b
+  data.tar.gz: c5ab8987a6a25209d03f4065f7d463ec8f233d9e0821bc9ad07c079056baa69b8e2f45d472caa73dc359067f461b2678507b604f243e1dc7721f6f460cde506c

data/README.md

@@ -71,7 +71,7 @@ Makes an api call using the respective HTTP verb through curl.
 
 Evaluates the given line of ruby code through `eval()`.
 - e.g.:
-  - test.rb (@/tmp/apidragonplugins/):
+  - Plugin.rb (@/tmp/apidragonplugins/):
   ```ruby
   class Plugin
     def initialize(message)
@@ -83,14 +83,15 @@ Evaluates the given line of ruby code through `eval()`.
     end
   end
   ```
+Notes: Filename and classname are arbitrary but should be the same as each other. Plugins must contain the above initialize method and a run method which can call any code desired.
   - apidragonconf.yaml:
   ```yaml
     vars:
       test: test
     example:
       test:
-        function: Plugin.new(@arg_bucket).run # initializes and calls the run function for my Plugin class, passing the arg_bucket.
-        plugin: test
+        function: Plugin # apidragon will attempt to load the class, call .new passing the @arg_bucket and then calling .run
+        plugin: Plugin # loads this file from /tmp/apidragonplugins/ 
         mode: plugin
   ```
   - ouput of `apidragon do example`:

data/VERSION

@@ -1 +1 @@
-1.6.1
+1.6.2

data/bin/apidragon

@@ -6,7 +6,7 @@ require_relative '../lib/apidragon.rb'
 
 Commander.configure do
   program :name, 'apidragon'
-  program :version, '1.6.1'
+  program :version, '1.6.2'
   program :description, 'CLI for automating api requests'
   program :help, 'Author', 'Isaiah Thiessen <isaiah.thiessen@telus.com>'
 

data/lib/apidragon/api.rb

@@ -16,7 +16,7 @@ class Api < ArgBucket
 
   def initialize(macro_name, config, username, password)
     @config_file = config
-    `mkdir #{PLUGINS}` unless Dir.exist? PLUGINS
+    Dir.mkdir PLUGINS unless Dir.exist? PLUGINS
     @arg_bucket = {}
     set 'username', username unless username.nil?
     set 'password', password unless password.nil?
@@ -35,9 +35,9 @@ class Api < ArgBucket
     @macro.each_pair do |_key, value|
       call = Call.new(value, @arg_bucket)
       @arg_bucket = call.run
-      if !value['record'].nil?
+      unless value['record'].nil?
         value['record'].each do |var|
-          add_config_var var, get(var) unless var=='function'
+          if value['record'].include?(var) then add_config_var var, get(var) end
         end
       end
     end

data/lib/apidragon/macro.rb

@@ -13,9 +13,9 @@ class Call < ArgBucket
       puts 'Plugin failed to load. Custom functions will not be run.'
       @plugin = nil
     end
-    @function = value['function']
+    @function = "#{value['function']}"
     credential_sub get('username'), get('password')
-    @mode = value['mode']
+    @mode = "#{value['mode']}"
     check_constraints
     @output = value['output']
     @logging = value['logging']
@@ -37,7 +37,7 @@ class Call < ArgBucket
     @input = {}
     input.each do |arg|
       value = get arg
-      if arg.nil? then puts "WARNING: required argument '#{arg}' not set." end
+      if arg.nil? then fail "Required argument '#{arg}' not defined." end
       @input[arg] = value
     end
   end
@@ -54,7 +54,11 @@ class Call < ArgBucket
         curl_request command
         @response = `#{command}`
       when 'plugin'
-        Plugin.new(@response).run
+        begin 
+          Object.const_get(@plugin).new(@arg_bucket).run
+        rescue
+          puts 'Plugin initialization failed. Class or methods may be incorrectly defined.'
+        end
       else
         puts "#{@mode} not supported."
     end
@@ -63,7 +67,7 @@ class Call < ArgBucket
       xml_to_json
       if @logging == true then log_response end
       @response = JSON.parse @response
-      if @stdout==true then puts JSON.pretty_generate @response end
+      if @stdout == true then puts JSON.pretty_generate @response end
       parse_response unless @output.nil?
     end
     return @arg_bucket

data/plugin_examples/GitClone.rb

@@ -0,0 +1,20 @@
+class GitClone
+  def initialize(args={})
+    @args = args
+  end
+  
+  def run
+    gitintegration
+  end
+  
+  def gitintegration
+    repo = @args['repo']
+    dir = repo.split('/').last
+    if Dir.exist? dir
+      out = `cd #{dir}; git pull`
+    else
+      `git clone #{repo};`
+    end
+    return "#{`pwd`}/#{dir}".gsub!("\n",'')
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apidragon
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.2
 platform: ruby
 authors:
 - isaiah thiessen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-14 00:00:00.000000000 Z
+date: 2015-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -256,8 +256,7 @@ files:
 - lib/apidragon/log.rb
 - lib/apidragon/macro.rb
 - lib/apidragon/parser.rb
-- plugin_examples/apidragonconf.yaml
-- plugin_examples/gitclone.rb
+- plugin_examples/GitClone.rb
 homepage: http://github.com/isand3r/apidragon
 licenses:
 - MIT

data/plugin_examples/apidragonconf.yaml

@@ -1,10 +0,0 @@
----
-vars:
-  repo: /some/repo # define the repo location
-  directory: /some/directory/path # define the directory you want to clone to
-macros:
-  myfirstmacro:
-    gitclone:
-      function: MyClass.new(@arg_bucket).run # instantiates MyClass with @arg_bucket (contains vars from config) and calls .run
-      mode: plugin
-      plugin: gitclone # causes the gitclone.rb file in /tmp/apidragonplugins/

data/plugin_examples/gitclone.rb

@@ -1,22 +0,0 @@
-require 'apidragon' # require the gem. you can use any gems you like!
-
-class MyClass < ArgBucket # inherit from the ArgBucket class for the 'get' and 'set' methods on @arg_bucket
-  def initialize(args)
-    @arg_bucket = args
-    puts @arg_bucket
-  end
-
-  def run
-    directory = get 'directory'
-    repo_name = get 'repo'
-    repo = 'http://github.com/isand3r' << repo_name
-    puts repo
-    puts directory
-    if Dir.exist?(directory) && Dir.exist?("#{directory}/#{repo_name}/.git")
-      `cd #{directory}/#{repo_name}; git pull`
-    else
-      puts "cloning #{repo}"
-      `mkdir #{directory}; cd #{directory}; git clone #{repo}`
-    end
-  end
-end