megam_api 0.92 → 0.93

data/lib/megam/core/config.rb

@@ -26,6 +26,7 @@ module Megam
     end
 
     email nil
+    password nil
     api_key nil
 
     # Set these to enable SSL authentication / mutual-authentication

data/lib/megam/core/marketplace.rb

@@ -17,28 +17,29 @@ require 'hashie'
 
 module Megam
   class MarketPlace < Megam::ServerAPI
-    def initialize(email = nil, api_key = nil, host = nil)
+    def initialize(o)
       @id = nil
-      @name = nil
+      @settings_name = nil
       @cattype = nil
-      @order = nil
+      @flavor = nil
       @image = nil
+      @catorder = nil
       @url = nil
       @envs = []
       @plans = nil
       @created_at = nil
-      super(email, api_key, host)
+      super(o)
     end
 
     def market_place
       self
     end
 
-    def name(arg = nil)
+    def settings_name(arg = nil)
       if !arg.nil?
-        @name = arg
+        @settings_name = arg
       else
-        @name
+        @settings_name
       end
     end
 
@@ -66,11 +67,19 @@ module Megam
       end
     end
 
-    def order(arg = nil)
+    def flavor(arg = nil)
       if !arg.nil?
-        @order = arg
+        @flavor = arg
       else
-        @order
+        @flavor
+      end
+    end
+    
+    def catorder(arg = nil)
+      if !arg.nil?
+        @catorder = arg
+      else
+        @catorder
       end
     end
 
@@ -124,10 +133,11 @@ module Megam
       index_hash = {}
       index_hash['json_claz'] = self.class.name
       index_hash['id'] = id
-      index_hash['name'] = name
+      index_hash['settings_name'] = settings_name
       index_hash['cattype'] = cattype
-      index_hash['order'] = order
+      index_hash['flavor'] = flavor
       index_hash['image'] = image
+      index_hash['catorder'] = catorder
       index_hash['url'] = url
       index_hash['envs'] = envs
       index_hash['plans'] = plans
@@ -144,10 +154,11 @@ module Megam
     def for_json
       result = {
         'id' => id,
-        'name' => name,
+        'settings_name' => settings_name,
         'cattype' => cattype,
-        'order' => order,
+        'flavor' => flavor,
         'image' => image,
+        'catorder' => catorder,
         'url' => url,
         'envs' => envs,
         'plans' => plans,
@@ -157,12 +168,13 @@ module Megam
     end
 
     def self.json_create(o)
-      app = new
+      app = new({})
       app.id(o['id']) if o.key?('id')
-      app.name(o['name']) if o.key?('name')
+      app.settings_name(o['settings_name']) if o.key?('settings_name')
       app.cattype(o['cattype']) if o.key?('cattype')
-      app.order(o['order']) if o.key?('order')
+      app.flavor(o['flavor']) if o.key?('flavor')
       app.image(o['image']) if o.key?('image')
+      app.catorder(o['catorder']) if o.key?('catorder')
       app.url(o['url']) if o.key?('url')
       app.envs(o['envs']) if o.key?('envs')
       app.plans(o['plans']) if o.key?('plans')
@@ -171,18 +183,19 @@ module Megam
       app
     end
 
-    def self.from_hash(o, tmp_email = nil, tmp_api_key = nil, tmp_host = nil)
-      app = new(tmp_email, tmp_api_key, tmp_host)
+    def self.from_hash(o)
+      app = new(o)
       app.from_hash(o)
       app
     end
 
     def from_hash(o)
-      @name           = o['name'] if o.key?('name')
+      @settings_name  = o['settings_name'] if o.key?('settings_name')
       @id             = o['id'] if o.key?('id')
       @cattype        = o['cattype'] if o.key?('cattype')
-      @order          = o['order'] if o.key?('order')
+      @flavor         = o['flavor'] if o.key?('flavor')
       @image          = o['image'] if o.key?('image')
+      @catorder            = o['catorder'] if o.key?('catorder')
       @url            = o['url'] if o.key?('url')
       @envs           = o['envs'] if o.key?('envs')
       @plans          = o['plans'] if o.key?('plans')
@@ -191,7 +204,7 @@ module Megam
     end
 
     def self.create(params)
-      acct = from_hash(params, params['email'], params['api_key'], params['host'])
+      acct = from_hash(params)
       acct.create
     end
 
@@ -202,12 +215,12 @@ module Megam
 
     # Load a account by email_p
     def self.show(params)
-      app = new(params['email'], params['api_key'], params['host'])
+      app = new(params)
       app.megam_rest.get_marketplaceapp(params['id'])
     end
 
     def self.list(params)
-      app = new(params['email'], params['api_key'], params['host'])
+      app = new(params)
       app.megam_rest.get_marketplaceapps
     end
 

data/lib/megam/core/marketplace_collection.rb

@@ -17,7 +17,6 @@ module Megam
   class MarketPlaceCollection
     include Enumerable
 
-    
     attr_reader :iterator
     def initialize
       @apps = Array.new
@@ -36,14 +35,14 @@ module Megam
     def []=(index, arg)
       is_megam_app(arg)
       @apps[index] = arg
-      @apps_by_name[arg.name] = index
+      @apps_by_name[arg.flavor] = index
     end
 
     def <<(*args)
       args.flatten.each do |a|
         is_megam_app(a)
         @apps << a
-        @apps_by_name[a.name] = @apps.length - 1
+        @apps_by_name[a.flavor] = @apps.length - 1
       end
       self
     end
@@ -62,11 +61,11 @@ module Megam
         @apps_by_name.each_key do |key|
         @apps_by_name[key] += 1 if @apps_by_name[key] > @insert_after_idx
         end
-        @apps_by_name[app.name] = @insert_after_idx + 1
+        @apps_by_name[app.flavor] = @insert_after_idx + 1
         @insert_after_idx += 1
       else
       @apps << app
-      @apps_by_name[app.name] = @apps.length - 1 
+      @apps_by_name[app.flavor] = @apps.length - 1
       end
     end
 
@@ -89,7 +88,7 @@ module Megam
     def lookup(app)
       lookup_by = nil
       if app.kind_of?(Megam::MarketPlace)
-      lookup_by = app.name
+      lookup_by = app.flavor
       elsif app.kind_of?(String)
       lookup_by = app
       else
@@ -101,12 +100,12 @@ module Megam
       end
       @apps[res]
     end
-    
+
      # Transform the ruby obj ->  to a Hash
     def to_hash
       index_hash = Hash.new
       self.each do |app|
-        index_hash[app.name] = app.to_s
+        index_hash[app.flavor] = app.to_s
       end
       index_hash
     end
@@ -131,8 +130,8 @@ module Megam
 
     private
 
-    
-    
+
+
     def is_megam_app(arg)
       unless arg.kind_of?(Megam::MarketPlace)
         raise ArgumentError, "Members must be Megam::MarketPlace's"

data/lib/megam/core/organizations.rb

@@ -16,13 +16,13 @@
 
 module Megam
   class Organizations < Megam::ServerAPI
-    def initialize(email=nil, api_key=nil, host=nil)
+    def initialize(o)
       @id = nil
       @name = nil
       @accounts_id = nil
       @related_orgs = []
       @created_at = nil
-      super(email, api_key, host)
+      super(o)
     end
 
     def organization
@@ -53,14 +53,13 @@ module Megam
       end
     end
 
-
-        def related_orgs(arg=[])
-          if arg != []
-            @related_orgs = arg
-          else
-          @related_orgs
-          end
-        end
+    def related_orgs(arg=[])
+      if arg != []
+        @related_orgs = arg
+      else
+      @related_orgs
+      end
+    end
 
     def created_at(arg=nil)
       if arg != nil
@@ -99,7 +98,7 @@ module Megam
 
     # Create a Megam::Organization from JSON (used by the backgroud job workers)
     def self.json_create(o)
-      org = new
+      org = new({})
       org.id(o["id"]) if o.has_key?("id")
       org.name(o["name"]) if o.has_key?("name")
       org.accounts_id(o["accounts_id"]) if o.has_key?("accounts_id")
@@ -109,7 +108,7 @@ module Megam
     end
 
     def self.from_hash(o)
-      org = self.new(o[:email], o[:api_key], o[:host])
+      org = self.new(o)
       org.from_hash(o)
       org
     end
@@ -135,15 +134,14 @@ module Megam
     end
 
     def self.update(o)
-     org = from_hash(o)
-     org.update
-   end
-
-   # Create the node via the REST API
-   def update
-     megam_rest.update_organization(to_hash)
-   end
+      org = from_hash(o)
+      org.update
+    end
 
+    # Create the node via the REST API
+    def update
+      megam_rest.update_organization(to_hash)
+    end
 
     def self.list(o)
       org = from_hash(o)

data/lib/megam/core/server_api.rb

@@ -22,16 +22,19 @@ module Megam
     attr_reader :email
     attr_reader :api_key
     attr_reader :host
-
+    attr_reader :password
+    attr_reader :org_id
 
     # 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.io, a call to +get+ with 'accounts' will make an
     # HTTP GET request to https://api.megam.io/accounts using the email, api_key
-    def initialize(email=nil, api_key=nil, host=nil)
-      @email = email
-      @api_key = api_key
-      @host = host
+    def initialize(o)
+      @email = o[:email]
+      @api_key = o[:api_key] || nil
+      @host = o[:host]
+      @password = o[:password] || nil
+      @org_id = o[:org_id]
     end
 
     # Build a megam api client
@@ -39,7 +42,7 @@ module Megam
     # === Parameters
     # api:: The Megam::API client
     def megam_rest
-      options = { :email =>email || Megam::Config[:email], :api_key => api_key || Megam::Config[:api_key], :host => host || Megam::Config[:host]}
+      options = { :email => email || Megam::Config[:email], :api_key => api_key || Megam::Config[:api_key], :org_id => org_id || Megam::Config[:org_id], :password => password || Megam::Config[:password], :host => host || Megam::Config[:host]}
       Megam::API.new(options)
     end
 

data/lib/megam/core/sshkey.rb

@@ -15,14 +15,15 @@
 #
 module Megam
   class SshKey < Megam::ServerAPI
-    def initialize(email=nil, api_key=nil, host=nil)
+    def initialize(o)
       @id = nil
       @name = nil
-      @accounts_id = nil
-      @path=nil
+      @org_id = nil
+      @privatekey=nil
+      @publickey=nil
       @created_at = nil
       @some_msg = {}
-      super(email, api_key, host)
+      super(o)
     end
 
     def sshkey
@@ -45,22 +46,31 @@ module Megam
       end
     end
 
-    def accounts_id(arg=nil)
+    def org_id(arg=nil)
       if arg != nil
-        @accounts_id= arg
+        @org_id= arg
       else
-      @accounts_id
+      @org_id
       end
     end
 
-    def path(arg=nil)
+    def privatekey(arg=nil)
       if arg != nil
-        @path= arg
+        @privatekey = arg
       else
-      @path
+      @privatekey
       end
     end
 
+    def publickey(arg=nil)
+      if arg != nil
+        @publickey = arg
+      else
+      @publikey
+      end
+    end
+
+
     def created_at(arg=nil)
       if arg != nil
         @created_at = arg
@@ -87,8 +97,9 @@ module Megam
       index_hash["json_claz"] = self.class.name
       index_hash["id"] = id
       index_hash["name"] = name
-      index_hash["accounts_id"] = accounts_id
-      index_hash["path"] = path
+      index_hash["org_id"] = org_id
+      index_hash["privatekey"] = privatekey
+      index_hash["publickey"] = publickey
       index_hash["created_at"] = created_at
       index_hash
     end
@@ -103,8 +114,9 @@ module Megam
       result = {
         "id" => id,
         "name" => name,
-        "accounts_id" => accounts_id,
-        "path" => path,
+        "org_id" => org_id,
+        "privatekey" => privatekey,
+        "publickey" => publickey,
         "created_at" => created_at
       }
       result
@@ -112,10 +124,11 @@ module Megam
 
     #
     def self.json_create(o)
-      sshKey = new
+      sshKey = new({})
       sshKey.id(o["id"]) if o.has_key?("id")
       sshKey.name(o["name"]) if o.has_key?("name")
-      sshKey.path(o["path"]) if o.has_key?("path")
+      sshKey.privatekey(o["privatekey"]) if o.has_key?("privatekey")
+      sshKey.publickey(o["publickey"]) if o.has_key?("publickey")
       sshKey.created_at(o["created_at"]) if o.has_key?("created_at")
       #success or error
       sshKey.some_msg[:code] = o["code"] if o.has_key?("code")
@@ -125,8 +138,8 @@ module Megam
       sshKey
     end
 
-    def self.from_hash(o,tmp_email=nil, tmp_api_key=nil, tmp_host=nil)
-      sshKey = self.new(tmp_email, tmp_api_key, tmp_host)
+    def self.from_hash(o)
+      sshKey = self.new(o)
       sshKey.from_hash(o)
       sshKey
     end
@@ -134,13 +147,15 @@ module Megam
     def from_hash(o)
       @id        = o[:id] if o.has_key?(:id)
       @name = o[:name] if o.has_key?(:name)
-      @path   = o[:path] if o.has_key?(:path)
+      @org_id = o[:org_id] if o.has_key?(:org_id)
+      @privatekey = o[:privatekey] if o.has_key?(:privatekey)
+      @publickey = o[:publickey] if o.has_key?(:publickey)
       @created_at   = o[:created_at] if o.has_key?(:created_at)
       self
     end
 
     def self.create(params)
-      acct = from_hash(params, params["email"], params["api_key"], params["host"])
+      acct = from_hash(params)
       acct.create
     end
 
@@ -153,14 +168,14 @@ module Megam
     # returns a sshkeysCollection
     # don't return self. check if the Megam::SshKeyCollection is returned.
     def self.list(params)
-      sshKey = self.new(params["email"], params["api_key"], params["host"])
+      sshKey = self.new(params)
       sshKey.megam_rest.get_sshkeys
     end
 
     # Show a particular sshKey by name,
     # Megam::SshKey
     def self.show(params)
-      pre = self.new(params["email"], params["api_key"], params["host"])
+      pre = self.new(params)
       pre.megam_rest.get_sshkey(params["name"])
     end