megam_api 0.79 → 0.81

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 265578c80c963c09316bd9815e2e19c3e3973956
-  data.tar.gz: 86c8ba17bb8654c7b970a367240a6554845a58b5
+  metadata.gz: c7466e46e439d0da4cf472e1b19dd2841efcd2eb
+  data.tar.gz: e9916130b60222949e521bf5d49ad678480b0acf
 SHA512:
-  metadata.gz: db751289790035ab255e2052c491ee09c19c4889f1ac180c6f5de499e52a8f92339726d353c17bdbe61119f28540d5828a84800d1bb05b7d321e50da440cf436
-  data.tar.gz: 33c749e14be9ed9820969076fbb2f07a0db4142cb64608107accc1cc63623199d994600371b9424148f662fcec774a0e3168abfe61e47806a33f9781e087f1ae
+  metadata.gz: 2dec71bf5241d1a3311698cf48e15cfbe20c343188993dbb1bcdd003d6a198f3850c4a59f8ec31e30869c70ee389e131277bc711ba1bab3bca630049e3781dac
+  data.tar.gz: 07bf76ee7a910c200503f130d86ac87c5aeaa786281a10964f6d4cccc9104308a735485d90d97d66703859274f3b465a3ee07f5189ff9aef3c9087c1d219fc4d

data/lib/megam/api/version.rb

@@ -1,5 +1,5 @@
 module Megam
   class API
-    VERSION = "0.79"
+    VERSION = "0.81"
   end
 end

data/lib/megam/core/marketplace.rb

@@ -17,14 +17,15 @@ require 'hashie'
 
 module Megam
   class MarketPlace < Megam::ServerAPI
-    def initialize(email=nil, api_key=nil, host=nil)
+    def initialize(email = nil, api_key = nil, host = nil)
       @id = nil
       @name = nil
       @cattype = nil
       @order = nil
       @image = nil
       @url = nil
-      @plans= nil
+      @envs = []
+      @plans = nil
       @created_at = nil
       super(email, api_key, host)
     end
@@ -33,95 +34,104 @@ module Megam
       self
     end
 
-
-    def name(arg=nil)
-      if arg != nil
+    def name(arg = nil)
+      if !arg.nil?
         @name = arg
       else
-      @name
+        @name
       end
     end
 
-    def id(arg=nil)
-      if arg != nil
+    def id(arg = nil)
+      if !arg.nil?
         @id = arg
       else
-      @id
+        @id
       end
     end
 
-    def plans(arg=nil)
-      if arg != nil
+    def plans(arg = nil)
+      if !arg.nil?
         @plans = arg
       else
-      @plans
+        @plans
       end
     end
 
-    def cattype(arg=nil)
-      if arg != nil
+    def cattype(arg = nil)
+      if !arg.nil?
         @cattype = arg
       else
-      @cattype
+        @cattype
       end
     end
 
-    def order(arg=nil)
-      if arg != nil
+    def order(arg = nil)
+      if !arg.nil?
         @order = arg
       else
-      @order
+        @order
       end
     end
 
-    def image(arg=nil)
-      if arg != nil
+    def image(arg = nil)
+      if !arg.nil?
         @image = arg
       else
-      @image
+        @image
       end
     end
 
-    def url(arg=nil)
-      if arg != nil
+    def url(arg = nil)
+      if !arg.nil?
         @url = arg
       else
-      @url
+        @url
       end
     end
 
-    def created_at(arg=nil)
-      if arg != nil
+    def envs(arg = [])
+      if arg != []
+        @envs = arg
+      else
+        @envs
+      end
+    end
+
+
+    def created_at(arg = nil)
+      if !arg.nil?
         @created_at = arg
       else
-      @created_at
+        @created_at
       end
     end
 
-    def some_msg(arg=nil)
-      if arg != nil
+    def some_msg(arg = nil)
+      if !arg.nil?
         @some_msg = arg
       else
-      @some_msg
+        @some_msg
       end
     end
 
     def error?
-      crocked  = true if (some_msg.has_key?(:msg_type) && some_msg[:msg_type] == "error")
+      crocked = true if some_msg.key?(:msg_type) && some_msg[:msg_type] == 'error'
     end
 
     # Transform the ruby obj ->  to a Hash
     def to_hash
-      index_hash = Hash.new
-      index_hash["json_claz"] = self.class.name
-      index_hash["id"] = id
-      index_hash["name"] = name
-      index_hash["cattype"] = cattype
-      index_hash["order"] = order
-      index_hash["image"] = image
-      index_hash["url"] = url
-      index_hash["plans"] = plans
-      index_hash["created_at"] = created_at
+      index_hash = {}
+      index_hash['json_claz'] = self.class.name
+      index_hash['id'] = id
+      index_hash['name'] = name
+      index_hash['cattype'] = cattype
+      index_hash['order'] = order
+      index_hash['image'] = image
+      index_hash['url'] = url
+      index_hash['envs'] = envs
+      index_hash['plans'] = plans
+      index_hash['created_at'] = created_at
       index_hash
     end
 
@@ -133,52 +143,55 @@ module Megam
 
     def for_json
       result = {
-        "id" => id,
-        "name" => name,
-        "cattype" => cattype,
-        "order" => order,
-        "image" => image,
-        "url" => url,
-        "plans" => plans,
-        "created_at" => created_at
+        'id' => id,
+        'name' => name,
+        'cattype' => cattype,
+        'order' => order,
+        'image' => image,
+        'url' => url,
+        'envs' => envs,
+        'plans' => plans,
+        'created_at' => created_at
       }
       result
     end
 
     def self.json_create(o)
       app = new
-      app.id(o["id"]) if o.has_key?("id")
-      app.name(o["name"]) if o.has_key?("name")
-      app.cattype(o["cattype"]) if o.has_key?("cattype")
-      app.order(o["order"]) if o.has_key?("order")
-      app.image(o["image"]) if o.has_key?("image")
-      app.url(o["url"]) if o.has_key?("url")
-      app.plans(o["plans"]) if o.has_key?("plans")
-      app.created_at(o["created_at"]) if o.has_key?("created_at")
+      app.id(o['id']) if o.key?('id')
+      app.name(o['name']) if o.key?('name')
+      app.cattype(o['cattype']) if o.key?('cattype')
+      app.order(o['order']) if o.key?('order')
+      app.image(o['image']) if o.key?('image')
+      app.url(o['url']) if o.key?('url')
+      app.envs(o['envs']) if o.key?('envs')
+      app.plans(o['plans']) if o.key?('plans')
+      app.created_at(o['created_at']) if o.key?('created_at')
 
       app
     end
 
-    def self.from_hash(o,tmp_email=nil, tmp_api_key=nil, tmp_host=nil)
-      app = self.new(tmp_email, tmp_api_key, tmp_host)
+    def self.from_hash(o, tmp_email = nil, tmp_api_key = nil, tmp_host = nil)
+      app = new(tmp_email, tmp_api_key, tmp_host)
       app.from_hash(o)
       app
     end
 
     def from_hash(o)
-      @name           = o["name"] if o.has_key?("name")
-      @id             = o["id"] if o.has_key?("id")
-      @cattype        = o["cattype"] if o.has_key?("cattype")
-      @order          = o["order"] if o.has_key?("order")
-      @image          = o["image"] if o.has_key?("image")
-      @url            = o["url"] if o.has_key?("url")
-      @plans          = o["plans"] if o.has_key?("plans")
-      @created_at     = o["created_at"] if o.has_key?("created_at")
+      @name           = o['name'] if o.key?('name')
+      @id             = o['id'] if o.key?('id')
+      @cattype        = o['cattype'] if o.key?('cattype')
+      @order          = o['order'] if o.key?('order')
+      @image          = o['image'] if o.key?('image')
+      @url            = o['url'] if o.key?('url')
+      @envs           = o['envs'] if o.key?('envs')
+      @plans          = o['plans'] if o.key?('plans')
+      @created_at     = o['created_at'] if o.key?('created_at')
       self
     end
 
     def self.create(params)
-      acct = from_hash(params, params["email"], params["api_key"], params["host"])
+      acct = from_hash(params, params['email'], params['api_key'], params['host'])
       acct.create
     end
 
@@ -189,19 +202,18 @@ module Megam
 
     # Load a account by email_p
     def self.show(params)
-      app = self.new(params["email"], params["api_key"], params["host"])
-      app.megam_rest.get_marketplaceapp(params["id"])
+      app = new(params['email'], params['api_key'], params['host'])
+      app.megam_rest.get_marketplaceapp(params['id'])
     end
 
     def self.list(params)
-      app = self.new(params["email"], params["api_key"], params["host"])
+      app = new(params['email'], params['api_key'], params['host'])
       app.megam_rest.get_marketplaceapps
     end
 
     def to_s
       Megam::Stuff.styled_hash(to_hash)
-    #"---> Megam::Account:[error=#{error?}]\n"+
+      # "---> Megam::Account:[error=#{error?}]\n"+
     end
-
   end
 end

data/test/test_assemblies.rb

@@ -53,7 +53,7 @@ class TestApps < MiniTest::Unit::TestCase
        "tosca_type" => "tosca.torpedo.coreos",
         "inputs" => [{
           "key" => "Domain",
-          "value" => "megmbox.com"
+          "value" => ""
         },
         {
           "key" => "sshKey",

data/test/test_assembly.rb

@@ -1,7 +1,7 @@
 require File.expand_path("#{File.dirname(__FILE__)}/test_helper")
 
 class TestApps < MiniTest::Unit::TestCase
-=begin
+#=begin
   def test_post_assembly
     tmp_hash = { "name" => "calcines",
       "components" => ["COM1270769168056188928",""],
@@ -21,13 +21,13 @@ class TestApps < MiniTest::Unit::TestCase
     response = megams.post_assembly(tmp_hash)
     assert_equal(201, response.status)
   end
-=end
-#=begin
+#=end
+=begin
   def test_get_assembly
-    response = megams.get_one_assembly("ASY1271842787775610880")
+    response = megams.get_one_assembly("ASY1273588307275677696")
     assert_equal(200, response.status)
   end
-#=end
+=end
 =begin
   def test_update_assembly
     tmp_hash =  {

data/test/test_marketplaces.rb

@@ -1,7 +1,7 @@
 require File.expand_path("#{File.dirname(__FILE__)}/test_helper")
 
 class TestMarketplaces < MiniTest::Unit::TestCase
-
+=begin
   def test_post_marketplace
     tmp_hash = {
       "name" => "34-Trac",
@@ -9,20 +9,28 @@ class TestMarketplaces < MiniTest::Unit::TestCase
       "plans" => [{"price"=> "30", "description"=> "description", "plantype"=> "paid", "version"=> "0.1", "source"=> "source"}],
       "cattype" => "DEW",
       "predefnode" => "java",
-      "status" => "ACTIVE" }
+      "status" => "ACTIVE",
+      "order" => "",
+      "image" => "",
+      "url" => "",
+      "envs" => []
+     }
 
     response = megams.post_marketplaceapp(tmp_hash)
     assert_equal(201, response.status)
   end
+=end
 
+#=begin
   def test_get_marketplaces
     response = megams.get_marketplaceapps
     assert_equal(200, response.status)
   end
-
+#=end
+=begin
  def test_get_marketplace
-    response = megams.get_marketplaceapp("34-Trac")
+    response = megams.get_marketplaceapp("Mysql")
     assert_equal(200, response.status)
   end
-
+=end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: megam_api
 version: !ruby/object:Gem::Version
-  version: '0.79'
+  version: '0.81'
 platform: ruby
 authors:
 - Rajthilak, Kishorekumar Neelamegam, Thomas Alrin, Yeshwanth Kumar, Subash Sethurajan,
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-30 00:00:00.000000000 Z
+date: 2015-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon