megam_api 0.7.4 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 567e77145904043583d51b42540f6e9d7f448dbc
-  data.tar.gz: cdcb2136da6829ea5a122cc729d954487450f768
+  metadata.gz: 102f1b08a1634e0299de9f614948ea96ec778582
+  data.tar.gz: 4737f0ebf23bd07d50b2a4839d2b885c308297bb
 SHA512:
-  metadata.gz: a16c3b6745f7d34700f0566fb95f1e962f944f22ed7097300f4ef82272aa24dda316ad58573cdfd236628587f5a86981e28af31019a0fb41f0e42aa5ed233187
-  data.tar.gz: 7faaf92acc98c9cca6391d80ddd14acd8e2eb8616b958665ed6422c4ba1c93c7a94930ea7e553bf2d60c8e3900307ee214ff65bf769b87c66ddbf6a742222547
+  metadata.gz: 8267e94e40f869513b80e966d9aa1907313003775445c8551cf9dba9f1df0801c2d94cc90f0d3e5f1a429788692a7d97d918d33b5f29ff78de00637d6ff7f96e
+  data.tar.gz: 2888e0eb803c614df338ad0d2dd6b2a2932bbba84aa4e69370f39139b696077bfa8353051d357f1c18c2af42a3d3a7f456b419660e428b7a1772b6de69ee12f1

data/lib/megam/api.rb

@@ -27,6 +27,7 @@ require "megam/api/predefs"
 require "megam/api/predef_clouds"
 require "megam/api/cloud_tools"
 require "megam/api/cloud_tool_settings"
+require "megam/core/server_api"
 require "megam/core/config"
 require "megam/core/stuff"
 require "megam/core/text"

data/lib/megam/api/version.rb

@@ -1,5 +1,5 @@
 module Megam
   class API
-    VERSION = "0.7.4"
+    VERSION = "0.7.5"
   end
 end

data/lib/megam/builder/delete_node.rb

@@ -14,15 +14,15 @@
 # limitations under the License.
 #
 module Megam
-  class DeleteNode
-    def megam_rest
-      options = { :email => Megam::Config[:email], :api_key => Megam::Config[:api_key]}
-      Megam::API.new(options)
+  class DeleteNode < Megam::ServerAPI
+    
+    def initialize(email=nil, api_key=nil)      
+      super(email, api_key)
     end
+    
 
-    def self.create(node_name, group, action)
-
-      delete_command = self.new()
+    def self.create(node_name, group, action, tmp_email, tmp_api_key)
+      delete_command = self.new(tmp_email, tmp_api_key)
       begin
         node_collection = delete_command.megam_rest.get_node(node_name)
         ct_collection = delete_command.megam_rest.get_cloudtools

data/lib/megam/builder/make_node.rb

@@ -14,15 +14,16 @@
 # limitations under the License.
 #
 module Megam
-  class MakeNode
-    def megam_rest
-      options = { :email => Megam::Config[:email], :api_key => Megam::Config[:api_key]}
-      Megam::API.new(options)
+  class MakeNode < Megam::ServerAPI
+    
+    def initialize(email=nil, api_key=nil)      
+      super(email, api_key)
     end
-
-    def self.create(data, group, action)
-
-      make_command = self.new()
+    
+    
+    
+    def self.create(data, group, action,tmp_email, tmp_api_key)
+      make_command = self.new(tmp_email, tmp_api_key)
       begin
         pc_collection = make_command.megam_rest.get_predefclouds
         ct_collection = make_command.megam_rest.get_cloudtools
@@ -121,11 +122,11 @@ module Megam
       node_hash
     end
 
-    def self.change_runtime(deps, runtime, action)      
+    def self.change_runtime(deps, runtime, action)
       project_name = File.basename(deps).split(".").first
       if /<projectname>/.match(runtime)
         runtime["unicorn_<projectname>"] = "unicorn_" + project_name
-      end            
+      end
       runtime
     end
   end

data/lib/megam/core/account.rb

@@ -14,14 +14,15 @@
 # limitations under the License.
 #
 module Megam
-  class Account
-    def initialize
+  class Account < Megam::ServerAPI
+    def initialize(email=nil, api_key=nil)
       @id = nil
       @email = nil
       @api_key = nil
       @authority = nil
       @created_at = nil
       @some_msg = {}
+      super(email, api_key)
     end
 
     #used by resque workers and any other background job
@@ -29,11 +30,6 @@ module Megam
       self
     end
 
-    def megam_rest
-      options = { :email => Megam::Config[:email], :api_key => Megam::Config[:api_key]}
-      Megam::API.new(options)
-    end
-
     def id(arg=nil)
       if arg != nil
         @id = arg
@@ -132,17 +128,17 @@ module Megam
     end
 
     def self.from_hash(o)
-      acct = self.new()
+      acct = self.new(o[:email], o[:api_key])
       acct.from_hash(o)
       acct
     end
 
     def from_hash(o)
       @id        = o[:id] if o.has_key?(:id)
-      @email      = o[:email] if o.has_key?(:email)
+      @email     = o[:email] if o.has_key?(:email)
       @api_key   = o[:api_key] if o.has_key?(:api_key)
       @authority = o[:authority] if o.has_key?(:authority)
-      @created_at        = o[:created_at] if o.has_key?(:created_at)
+      @created_at = o[:created_at] if o.has_key?(:created_at)
       self
     end
 
@@ -152,9 +148,9 @@ module Megam
     end
 
     # Load a account by email_p
-    def self.show(email)
-      acct = self.new()
-      acct.megam_rest.get_accounts(email)
+    def self.show(email,api_key=nil)
+      acct = self.new(email, api_key)
+      megam_rest.get_accounts(email)
     end
 
     # Create the node via the REST API
@@ -164,7 +160,6 @@ module Megam
 
     def to_s
       Megam::Stuff.styled_hash(to_hash)
-    #"---> Megam::Account:[error=#{error?}]\n"+
     end
   end
 end

data/lib/megam/core/app_request.rb

@@ -14,11 +14,9 @@
 # limitations under the License.
 #
 module Megam
-  class AppRequest
-    # Each notify entry is a resource/action pair, modeled as an
-    # Struct with a #resource and #action member
-
-    def initialize
+  class AppRequest< Megam::ServerAPI
+    
+    def initialize(email=nil, api_key=nil)
       @id = nil
       @req_type = nil
       @appdefns_id = nil
@@ -28,15 +26,13 @@ module Megam
       @lc_when = nil
       @created_at = nil
       @some_msg = {}
+      super(email,api_key)
     end
+    
     def appreq
       self
     end
-
-    def megam_rest
-      options = { :email => Megam::Config[:email], :api_key => Megam::Config[:api_key]}
-      Megam::API.new(options)
-    end
+    
 
     def id(arg=nil)
       if arg != nil
@@ -188,8 +184,8 @@ module Megam
       appreq
     end
 
-    def self.from_hash(o)
-      appreq = self.new()
+    def self.from_hash(o,tmp_email=nil, tmp_api_key=nil)
+      appreq = self.new(tmp_email, tmp_api_key)
       appreq.from_hash(o)
       appreq
     end
@@ -206,8 +202,8 @@ module Megam
       self
     end
 
-    def self.create(o)
-      acct = from_hash(o)
+    def self.create(o,tmp_email=nil, tmp_api_key=nil)
+      acct = from_hash(o,tmp_email, tmp_api_key)
       acct.create
     end
 
@@ -217,15 +213,14 @@ module Megam
     end
 
     # Load a account by email_p
-    def self.list(node_name)
-      appreq = self.new()
+    def self.list(node_name,tmp_email=nil, tmp_api_key=nil)
+      appreq = self.new(tmp_email, tmp_api_key)
       appreq.megam_rest.get_appreq(node_name)
       #self
     end
 
     def to_s
       Megam::Stuff.styled_hash(to_hash)
-    #"---> Megam::Account:[error=#{error?}]\n"+
     end
 
   end

data/lib/megam/core/appdefns.rb

@@ -14,28 +14,23 @@
 # limitations under the License.
 #
 module Megam
-  class Appdefns
-    # Each notify entry is a resource/action pair, modeled as an
-    # Struct with a #resource and #action member
-
-    def initialize
+  class Appdefns < Megam::ServerAPI
+    
+    def initialize(email=nil, api_key=nil)
       @id = nil
       @node_id = nil
       @node_name = nil
       @appdefns ={}
       @created_at = nil
       @some_msg = {}
+      super(email, api_key)
     end
 
     def appdefns
       self
     end
 
-    def megam_rest
-      options = { :email => Megam::Config[:email], :api_key => Megam::Config[:api_key]}
-      Megam::API.new(options)
-    end
-
+    
     def id(arg=nil)
       if arg != nil
         @id = arg
@@ -141,8 +136,8 @@ module Megam
       appdefns
     end
 
-    def self.from_hash(o)
-      appdefns = self.new()
+    def self.from_hash(o,tmp_email=nil, tmp_api_key=nil)
+      appdefns = self.new(tmp_email, tmp_api_key)
       appdefns.from_hash(o)
       appdefns
     end
@@ -156,8 +151,8 @@ module Megam
       self
     end
 
-    def self.create(o)
-      acct = from_hash(o)
+    def self.create(o,tmp_email=nil, tmp_api_key=nil)
+      acct = from_hash(o,tmp_email=nil, tmp_api_key=nil)
       acct.create
     end
 
@@ -167,14 +162,14 @@ module Megam
     end
 
     # Load a account by email_p
-    def self.show(id)
-      appdefns = self.new()
+    def self.show(id,tmp_email=nil, tmp_api_key=nil)
+      appdefns = self.new(tmp_email, tmp_api_key)
       appdefns.megam_rest.get_appdefn(id)
     end
     
     # Load a account by email_p
-    def self.shown(node_name, id)
-      appdefns = self.new()
+    def self.show_by_node(node_name, id,tmp_email=nil, tmp_api_key=nil)
+      appdefns = self.new(tmp_email, tmp_api_key)
       appdefns.megam_rest.get_appdefn(node_name,id)
     end
 

data/lib/megam/core/bolt_request.rb

@@ -14,18 +14,8 @@
 # limitations under the License.
 #
 module Megam
-  class BoltRequest
-    # Each notify entry is a resource/action pair, modeled as an
-    # Struct with a #resource and #action member
-=begin
-  def self.hash_tree
-    Hash.new do |hash, key|
-      hash[key] = hash_tree
-    end
-  end
-=end
-
-    def initialize
+  class BoltRequest < Megam::ServerAPI
+    def initialize(email=nil, api_key=nil)
       @id = nil
       @req_type = nil
       @boltdefns_id = nil
@@ -35,16 +25,14 @@ module Megam
       @lc_when = nil
       @created_at = nil
       @some_msg = {}
+      super(email, api_key)
     end
+
     def boltreqs
       self
     end
 
-    def megam_rest
-      options = { :email => Megam::Config[:email], :api_key => Megam::Config[:api_key]}
-      Megam::API.new(options)
-    end
-
+    
     def id(arg=nil)
       if arg != nil
         @id = arg
@@ -108,6 +96,7 @@ module Megam
       @created_at
       end
     end
+
     def some_msg(arg=nil)
       if arg != nil
         @some_msg = arg
@@ -116,7 +105,6 @@ module Megam
       end
     end
 
-
     def error?
       crocked  = true if (some_msg.has_key?(:msg_type) && some_msg[:msg_type] == "error")
     end
@@ -157,7 +145,6 @@ module Megam
       result
     end
 
-
     # Create a Megam::Node from NodeResult-JSON
     #
     #[{
@@ -196,8 +183,8 @@ module Megam
       boltreqs
     end
 
-    def self.from_hash(o)
-      boltreqs = self.new()
+    def self.from_hash(o,tmp_email=nil, tmp_api_key=nil)
+      boltreqs = self.new(tmp_email, tmp_api_key)
       boltreqs.from_hash(o)
       boltreqs
     end
@@ -214,8 +201,8 @@ module Megam
       self
     end
 
-    def self.create(o)
-      acct = from_hash(o)
+    def self.create(o,tmp_email=nil, tmp_api_key=nil)
+      acct = from_hash(o,tmp_email, tmp_api_key)
       acct.create
     end
 
@@ -225,14 +212,13 @@ module Megam
     end
 
     # Load a account by email_p
-    def self.list(node_name)
-      boltreq = self.new()
+    def self.list(node_name,tmp_email=nil, tmp_api_key=nil)
+      boltreq = self.new(tmp_email, tmp_api_key)
       boltreq.megam_rest.get_boltreq(node_name)
     end
 
     def to_s
       Megam::Stuff.styled_hash(to_hash)
-    #"---> Megam::Account:[error=#{error?}]\n"+
     end
 
   end

data/lib/megam/core/boltdefns.rb

@@ -15,33 +15,22 @@
 #
 
 module Megam
-  class Boltdefns
-    # Each notify entry is a resource/action pair, modeled as an
-    # Struct with a #resource and #action member
-=begin
-def self.hash_tree
-Hash.new do |hash, key|
-hash[key] = hash_tree
-end
-end
-=end
-    def initialize
+  class Boltdefns < Megam::ServerAPI
+    def initialize(email=nil, api_key=nil)
       @id = nil
       @node_id = nil
       @node_name = nil
       @boltdefns ={}
       @created_at = nil
       @some_msg = {}
+      super(email,api_key)
     end
 
     def boltdefns
       self
     end
 
-    def megam_rest
-      options = { :email => Megam::Config[:email], :api_key => Megam::Config[:api_key]}
-      Megam::API.new(options)
-    end
+    
 
     def id(arg=nil)
       if arg != nil
@@ -172,8 +161,8 @@ end
       boltdefns
     end
 
-    def self.from_hash(o)
-      boltdefns = self.new()
+    def self.from_hash(o,tmp_email=nil, tmp_api_key=nil)
+      boltdefns = self.new(tmp_email, tmp_api_key)
       boltdefns.from_hash(o)
       boltdefns
     end
@@ -187,8 +176,8 @@ end
       self
     end
 
-    def self.create(o)
-      acct = from_hash(o)
+    def self.create(o,tmp_email=nil, tmp_api_key=nil)
+      acct = from_hash(o,tmp_email, tmp_api_key)
       acct.create
     end
 
@@ -198,14 +187,14 @@ end
     end
 
     # Show all bolt defns by [node_name]/email
-    def self.show(node_name)
-      boltdefns = self.new()
+    def self.show(node_name,tmp_email=nil, tmp_api_key=nil)
+      boltdefns = self.new(tmp_email, tmp_api_key)
       boltdefns.megam_rest.get_boltdefn(node_name)
     end
 
     # Show a bolt defn by [node_name, defn id] for an email
-    def self.shown(node_name,id)
-      boltdefns = self.new()
+    def self.show_by_node(node_name,id,tmp_email=nil, tmp_api_key=nil)
+      boltdefns = self.new(tmp_email, tmp_api_key)
       boltdefns.megam_rest.get_boltdefn(node_name,id)
     end
 

data/lib/megam/core/cloudtool.rb

@@ -14,24 +14,22 @@
 # limitations under the License.
 #
 module Megam
-  class CloudTool
-    def initialize
+  class CloudTool < Megam::ServerAPI
+    
+    def initialize(email=nil, api_key=nil)
       @id = nil
       @name = nil
       @cli = nil
       @cloudtemplates = nil
       @some_msg = {}
+      super(email, api_key)
     end
 
     def cloud_tool
       self
     end
 
-    def megam_rest
-      options = { :email => Megam::Config[:email], :api_key => Megam::Config[:api_key]}
-      Megam::API.new(options)
-    end
-
+    
     def id(arg=nil)
       if arg != nil
         @id = arg
@@ -133,15 +131,16 @@ module Megam
 
     # Load all cloudtools -
     # returns a CloudToolsCollection
-    def self.list
-      ct = self.new()
+    def self.list(tmp_email=nil, tmp_api_key=nil)
+      ct = self.new(tmp_email, tmp_api_key)
       ct.megam_rest.get_cloudtools
     end
 
     # Show a particular cloudtool by name,
     # Megam::CloudTool
-    def self.show(p_name)
-      megam_rest.get_cloudtool(p_name)
+    def self.show(p_name,tmp_email=nil, tmp_api_key=nil)
+      ct = self.new(tmp_email=nil, tmp_api_key=nil)
+      ct.megam_rest.get_cloudtool(p_name)
       self
     end
 

data/lib/megam/core/cloudtoolsetting.rb

@@ -14,10 +14,9 @@
 # limitations under the License.
 #
 module Megam
-  class CloudToolSetting
-    # Each notify entry is a resource/action pair, modeled as an
-    # Struct with a #resource and #action member
-    def initialize
+  class CloudToolSetting < Megam::ServerAPI
+    
+    def initialize(email=nil, api_key=nil)
       @id = nil
       @accounts_id = nil
       @cloud_type = nil
@@ -27,17 +26,14 @@ module Megam
       @conf_location=nil
       @created_at = nil
       @some_msg = {}
+      super(email, api_key)
     end
 
     def cloud_tool_setting
       self
     end
 
-    def megam_rest
-      options = { :email => Megam::Config[:email], :api_key => Megam::Config[:api_key]}
-      Megam::API.new(options)
-    end
-
+    
     def id(arg=nil)
       if arg != nil
         @id = arg
@@ -170,8 +166,8 @@ module Megam
       cts
     end
 
-    def self.from_hash(o)
-      cts = self.new()
+    def self.from_hash(o,tmp_email=nil, tmp_api_key=nil)
+      cts = self.new(tmp_email,tmp_api_key)
       cts.from_hash(o)
       cts
     end
@@ -188,8 +184,8 @@ module Megam
       self
     end
 
-    def self.create(o)
-      acct = from_hash(o)
+    def self.create(o,tmp_email=nil, tmp_api_key=nil)
+      acct = from_hash(o,tmp_email, tmp_api_key)
       acct.create
     end
 
@@ -201,21 +197,20 @@ module Megam
     # Load all cloudtoolsettings -
     # returns a cloudtoolsettingsCollection
     # don't return self. check if the Megam::cloudtoolsettingCollection is returned.
-    def self.list
-      cts = self.new()
+    def self.list(tmp_email=nil, tmp_api_key=nil)
+      cts = self.new(tmp_email, tmp_api_key)
       cts.megam_rest.get_cloudtoolsettings
     end
 
     # Show a particular cloudtoolsetting by name,
     # Megam::cloudtoolsetting
-    def self.show(p_name)
-      pre = self.new()
+    def self.show(p_name,tmp_email=nil, tmp_api_key=nil)
+      pre = self.new(tmp_email, tmp_api_key)
       pre.megam_rest.get_cloudtoolsetting(p_name)
     end
 
     def to_s
       Megam::Stuff.styled_hash(to_hash)
-    #"---> Megam::Account:[error=#{error?}]\n"+
     end
 
   end

data/lib/megam/core/node.rb

@@ -14,19 +14,10 @@
 # limitations under the License.
 #
 require 'hashie'
-module Megam
-  class Node
-    # Each notify entry is a resource/action pair, modeled as an
-    # Struct with a #resource and #action member
-=begin
-  def self.hash_tree
-    Hash.new do |hash, key|
-      hash[key] = hash_tree
-    end
-  end
-=end
 
-    def initialize
+module Megam
+  class Node < Megam::ServerAPI
+    def initialize(email=nil, api_key=nil)
       @id = nil
       @node_name = nil
       @accounts_id = nil
@@ -37,23 +28,20 @@ module Megam
       @request ={}
       @predefs={}
       @some_msg = {}
-      #@command = self.class.hash_tree
-	@command = Hashie::Mash.new
-	@appdefnsid = nil
-	@boltdefnsid = nil
-	@appdefns = {}
-	@boltdefns = {}
+      @command = Hashie::Mash.new
+      @appdefnsid = nil
+      @boltdefnsid = nil
+      @appdefns = {}
+      @boltdefns = {}
       @created_at = nil
+      super(email, api_key)
     end
+
     def node
       self
     end
 
-    def megam_rest
-      options = { :email => Megam::Config[:email], :api_key => Megam::Config[:api_key]}
-      Megam::API.new(options)
-    end
-
+    
     def node_name(arg=nil)
       if arg != nil
         @node_name = arg
@@ -149,6 +137,7 @@ module Megam
       @boltdefns
       end
     end
+
     def appdefnsid(arg=nil)
       if arg != nil
         @appdefnsid = arg
@@ -273,18 +262,18 @@ module Megam
 
       #Command
 =begin
-	node.command[:systemprovider][:provider][:prov] = oc["systemprovider"]["provider"]["prov"]
-	node.command[:compute][:cctype] = oc["compute"]["cctype"]
-	node.command[:compute][:cc][:groups] = oc["compute"]["cc"]["groups"]
-	node.command[:compute][:cc][:image] = oc["compute"]["cc"]["image"]
-	node.command[:compute][:cc][:flavor] = oc["compute"]["cc"]["flavor"]
-	node.command[:compute][:access][:ssh_key] = oc["compute"]["access"]["ssh_key"]
-	node.command[:compute][:access][:identity_file] = oc["compute"]["access"]["identity_file"]
-	node.command[:compute][:access][:ssh_user] = oc["compute"]["access"]["ssh_user"]
-	node.command[:cloudtool][:chef][:command] = oc["cloudtool"]["chef"]["command"]
-	node.command[:cloudtool][:chef][:plugin] = oc["cloudtool"]["chef"]["plugin"]
-	node.command[:cloudtool][:chef][:run_list] = oc["cloudtool"]["chef"]["run_list"]
-	node.command[:cloudtool][:chef][:name] = oc["cloudtool"]["chef"]["name"]
+node.command[:systemprovider][:provider][:prov] = oc["systemprovider"]["provider"]["prov"]
+node.command[:compute][:cctype] = oc["compute"]["cctype"]
+node.command[:compute][:cc][:groups] = oc["compute"]["cc"]["groups"]
+node.command[:compute][:cc][:image] = oc["compute"]["cc"]["image"]
+node.command[:compute][:cc][:flavor] = oc["compute"]["cc"]["flavor"]
+node.command[:compute][:access][:ssh_key] = oc["compute"]["access"]["ssh_key"]
+node.command[:compute][:access][:identity_file] = oc["compute"]["access"]["identity_file"]
+node.command[:compute][:access][:ssh_user] = oc["compute"]["access"]["ssh_user"]
+node.command[:cloudtool][:chef][:command] = oc["cloudtool"]["chef"]["command"]
+node.command[:cloudtool][:chef][:plugin] = oc["cloudtool"]["chef"]["plugin"]
+node.command[:cloudtool][:chef][:run_list] = oc["cloudtool"]["chef"]["run_list"]
+node.command[:cloudtool][:chef][:name] = oc["cloudtool"]["chef"]["name"]
 =end
       #predef
       op = o["predefs"]
@@ -321,8 +310,8 @@ module Megam
       node
     end
 
-    def self.from_hash(o)
-      node = self.new()
+    def self.from_hash(o,tmp_email=nil, tmp_api_key=nil)
+      node = self.new(tmp_email, tmp_api_key)
       node.from_hash(o)
       node
     end
@@ -345,8 +334,8 @@ module Megam
       self
     end
 
-    def self.create(o)
-      acct = from_hash(o)
+    def self.create(o,tmp_email=nil, tmp_api_key=nil)
+      acct = from_hash(o, tmp_email, tmp_api_key)
       acct.create
     end
 
@@ -356,13 +345,13 @@ module Megam
     end
 
     # Load a account by email_p
-    def self.show(node_name)
-      node = self.new()
+    def self.show(node_name,tmp_email=nil, tmp_api_key=nil)
+      node = self.new(tmp_email, tmp_api_key)
       node.megam_rest.get_node(node_name)
     end
 
-    def self.list
-      node = self.new()
+    def self.list(tmp_email=nil, tmp_api_key=nil)
+      node = self.new(tmp_email, tmp_api_key)
       node.megam_rest.get_nodes
     end
 

data/lib/megam/core/predef.rb

@@ -14,9 +14,8 @@
 # limitations under the License.
 #
 module Megam
-  class Predef
-
-    def initialize
+  class Predef < Megam::ServerAPI
+    def initialize(email=nil, api_key=nil)
       @id = nil
       @name = nil
       @provider = nil
@@ -25,17 +24,13 @@ module Megam
       @runtime_exec = nil
       @created_at = nil
       @some_msg = {}
+      super(email, api_key)
     end
 
     def predef
       self
     end
 
-    def megam_rest
-      options = { :email => Megam::Config[:email], :api_key => Megam::Config[:api_key]}
-      Megam::API.new(options)
-    end
-
     def id(arg=nil)
       if arg != nil
         @id = arg
@@ -67,7 +62,7 @@ module Megam
       @provider
       end
     end
-    
+
     def provider_role(arg=nil)
       if arg != nil
         @provider_role = arg
@@ -155,8 +150,8 @@ module Megam
       node
     end
 
-    def self.from_hash(o)
-      node = self.new()
+    def self.from_hash(o,tmp_email=nil, tmp_api_key=nil)
+      node = self.new(tmp_email, tmp_api_key)
       node.from_hash(o)
       node
     end
@@ -171,13 +166,12 @@ module Megam
       @created_at   = o[:created_at] if o.has_key?(:created_at)
       self
     end
-
-    def self.create
-      predef = build
+    
+    def self.create(o,tmp_email=nil, tmp_api_key=nil)
+      predef = from_hash(o,tmp_email, tmp_api_key)
       predef.create
     end
 
-   
     # Create the predef via the REST API
     def create(predef_input)
       megam_rest.post_predef(predef_input)
@@ -187,21 +181,20 @@ module Megam
     # Load all predefs -
     # returns a PredefsCollection
     # don't return self. check if the Megam::PredefCollection is returned.
-    def self.list
-	prede = self.new()
+    def self.list(tmp_email=nil, tmp_api_key=nil)
+      prede = self.new(tmp_email,tmp_api_key)
       prede.megam_rest.get_predefs
     end
 
     # Show a particular predef by name,
     # Megam::Predef
-    def self.show(p_name)
-	prede = self.new()
+    def self.show(p_name,tmp_email=nil, tmp_api_key=nil)
+      prede = self.new(tmp_email,tmp_api_key)
       prede.megam_rest.get_predef(p_name)
     end
 
     def to_s
       Megam::Stuff.styled_hash(to_hash)
-    #"---> Megam::Account:[error=#{error?}]\n"+
     end
 
   end

data/lib/megam/core/predefcloud.rb

@@ -15,10 +15,8 @@
 # limitations under the License.
 #
 module Megam
-  class PredefCloud
-    # Each notify entry is a resource/action pair, modeled as an
-    # Struct with a #resource and #action member
-    def initialize
+  class PredefCloud < Megam::ServerAPI
+    def initialize(email=nil, api_key=nil)
       @id = nil
       @name = nil
       @accounts_id = nil
@@ -28,17 +26,14 @@ module Megam
       #@performance = nil
       @created_at = nil
       @some_msg = {}
+      super(email, api_key)
     end
 
     def predef_cloud
       self
     end
 
-    def megam_rest
-      options = { :email => Megam::Config[:email], :api_key => Megam::Config[:api_key]}
-      Megam::API.new(options)
-    end
-
+    
     def id(arg=nil)
       if arg != nil
         @id = arg
@@ -200,8 +195,8 @@ module Megam
       self
     end
 
-    def self.create(o)
-      acct = from_hash(o)
+    def self.create(o,tmp_email=nil, tmp_api_key=nil)
+      acct = from_hash(o,tmp_email, tmp_api_key)
       acct.create
     end
 
@@ -213,16 +208,16 @@ module Megam
     # Load all predefs -
     # returns a PredefsCollection
     # don't return self. check if the Megam::PredefCollection is returned.
-    def self.list
-    predef = self.new()
+    def self.list(tmp_email=nil, tmp_api_key=nil)
+    predef = self.new(tmp_email,tmp_api_key)
       predef.megam_rest.get_predefclouds
     end
 
     # Show a particular predef by name,
     # Megam::Predef
-    def self.show(p_name)
-    pre = self.new()
-      pre.megam_rest.get_predefcloud(p_name)
+    def self.show(p_name,tmp_email=nil, tmp_api_key=nil)
+    pre = self.new(tmp_email,tmp_api_key)
+    pre.megam_rest.get_predefcloud(p_name)
     end
 
     def to_s

data/lib/megam/core/request.rb

@@ -14,8 +14,8 @@
 # limitations under the License.
 #
 module Megam
-  class Request
-    def initialize
+  class Request < Megam::ServerAPI
+    def initialize(email=nil, api_key=nil)
       @id = nil
       @node_id = nil
       @node_name = nil
@@ -23,17 +23,14 @@ module Megam
       @command =nil
       @some_msg = {}
       @created_at = nil
+      super(email, api_key)
     end
 
     def request
       self
     end
 
-    def megam_rest
-      options = { :email => Megam::Config[:email], :api_key => Megam::Config[:api_key]}
-      Megam::API.new(options)
-    end
-
+    
     def id(arg=nil)
       if arg != nil
         @id = arg
@@ -140,8 +137,8 @@ module Megam
       node
     end
 
-    def self.from_hash(o)
-      node = self.new()
+    def self.from_hash(o,tmp_email=nil, tmp_api_key=nil)
+      node = self.new(tmp_email, tmp_api_key)
       node.from_hash(o)
       node
     end
@@ -157,8 +154,8 @@ module Megam
     end
 
 
-    def self.create(o)
-      acct = from_hash(o)
+    def self.create(o,tmp_email=nil, tmp_api_key=nil)
+      acct = from_hash(o,tmp_email, tmp_api_key)
       acct.create
     end
 
@@ -168,13 +165,13 @@ module Megam
     end
 
     
-     def self.show
-      prede = self.new()
+     def self.show(tmp_email=nil, tmp_api_key=nil)
+      prede = self.new(tmp_email, tmp_api_key)
       prede.megam_rest.get_requests
     end
 
-     def self.list(n_name)
-      prede = self.new()
+     def self.list(n_name,tmp_email=nil, tmp_api_key=nil)
+      prede = self.new(tmp_email,tmp_api_key)
       prede.megam_rest.get_request(n_name)
     end
 

data/lib/megam/core/server_api.rb

@@ -0,0 +1,48 @@
+# Copyright:: Copyright (c) 2012, 2013 Megam Systems
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+module Megam
+  # Basic HTTP client, with support for adding features via middleware
+  class ServerAPI
+
+    
+    attr_reader :email
+    attr_reader :api_key
+
+
+    # Create a Megam REST object. The supplied email and api_key is used as the base for
+    # all subsequent requests. For example, when initialized with an email, api_key  url
+    # https://api.megam.co, a call to +get+ with 'nodes' will make an
+    # HTTP GET request to http://api.megam.co/nodes using the email, api_key
+    def initialize(email=nil, api_key=nil)
+      @email = email
+      @api_key = api_key      
+    end
+
+    # Build a megam api client
+    #
+    # === Parameters
+    # api:: The Megam::API client
+    def megam_rest
+      options = { :email =>email || Megam::Config[:email], :api_key => api_key || Megam::Config[:api_key]}
+      Megam::API.new(options)
+    end
+    
+
+
+  end
+end
+

data/megam_api.gemspec

@@ -16,11 +16,11 @@ Gem::Specification.new do |s|
   s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-  s.add_runtime_dependency 'excon', '~> 0'
-  s.add_runtime_dependency 'highline', '~> 0'
-  s.add_runtime_dependency 'yajl-ruby', '~> 0'
-  s.add_runtime_dependency 'mixlib-config', '~> 2.0'
-  s.add_runtime_dependency 'mixlib-log', '~> 1.0'
-  s.add_development_dependency 'minitest', '~> 0'
-  s.add_development_dependency 'rake', '~> 0'
+  s.add_runtime_dependency 'excon', '~> 0.31'
+  s.add_runtime_dependency 'highline', '~> 1.6'
+  s.add_runtime_dependency 'yajl-ruby', '~> 1.2'
+  s.add_runtime_dependency 'mixlib-config', '~> 2.1'
+  s.add_runtime_dependency 'mixlib-log', '~> 1.6'
+  s.add_development_dependency 'minitest', '~> 5.2'
+  s.add_development_dependency 'rake', '~> 10.1'
 end

data/test/test_accounts.rb

@@ -4,15 +4,15 @@ class TestAccounts < MiniTest::Unit::TestCase
 
   $admin = "admin-tom"
   $normal = "normal-tom"
+  $tom_email = "tom@gomegam.com"
+  $bob_email = "bob@gomegam.com"
 
   def test_get_accounts_good
-    #response =megams.get_accounts(sandbox_email)
-    response =megams.get_accounts('a@b.com')
+    response =megams.get_accounts(sandbox_email)
     response.body.to_s
     assert_equal(200, response.status)
   end
   
-=begin
   def test_get_accounts_bad
     assert_raises(Megam::API::Errors::NotFound) do
     response =megams.get_accounts(sandbox_email+"_bad")
@@ -22,14 +22,14 @@ class TestAccounts < MiniTest::Unit::TestCase
 
   def test_post_accounts_admin
     response =megams.post_accounts(
-    {:id => random_id, :email => sandbox_email, :api_key => sandbox_apikey, :authority => $admin})
+    {:id => random_id, :email => $tom_email, :api_key => sandbox_apikey, :authority => $admin})
     response.body.to_s
     assert_equal(201, response.status)
   end
 
   def test_post_accounts_normal
     response =megams.post_accounts(
-    {:id => random_id, :email => sandbox_email, :api_key => sandbox_apikey, :authority => $normal})
+    {:id => random_id, :email => $bob_email, :api_key => sandbox_apikey, :authority => $normal})
     response.body.to_s
     assert_equal(201, response.status)
   end
@@ -42,6 +42,4 @@ class TestAccounts < MiniTest::Unit::TestCase
     response.body.to_s
     end    
   end
-=end
-end
-
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: megam_api
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.5
 platform: ruby
 authors:
 - Kishorekumar Neelamegam, Thomas Alrin, Subash Sethurajan, Rajthilak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-03 00:00:00.000000000 Z
+date: 2014-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -16,98 +16,98 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.31'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.31'
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: mixlib-config
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: mixlib-log
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.1'
 description: Ruby Client for the Megam Cloud. Performs REST based HTTP calls to api.megam.co
   http://github.com/indykish/megam_play.git
 email:
@@ -177,6 +177,7 @@ files:
 - lib/megam/core/predefcloud_collection.rb
 - lib/megam/core/request.rb
 - lib/megam/core/request_collection.rb
+- lib/megam/core/server_api.rb
 - lib/megam/core/stuff.rb
 - lib/megam/core/text.rb
 - lib/megam/core/text_formatter.rb