megam_api 0.43 → 0.44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eebcad90954af1dae6376ace92b915a35f81261d
-  data.tar.gz: a8bb083480de64a1d065b05a65d00217ed133e94
+  metadata.gz: 9878e6043a2b15cad23ce5f5910b02dd2d0f153d
+  data.tar.gz: f1ac9270a97ac5043d8b0ea4e869742eac68d914
 SHA512:
-  metadata.gz: e20ad0b6ec7dfec6c8ff75d09542e3e248c3465f56f6cb985bf873325535d8c5e178898f1cb63746ef0f9ae64cc23cb76293a5282275c08f29e47afa2a22c5f9
-  data.tar.gz: a7f4fb0c29ff96796ffde4f4b70de1500de753dad418cf0a61a29475b8f3b0e374b7438b977437732646b16ccdf869994e0400fe797e94d75f189aac4932920b
+  metadata.gz: 7e335d1d1a744da8114f5d4e395ab1f3c2bedf75b281a035373d202ffef01141b0cfdb760e1e7db2d3abfcfa3d9c13cc4f1d98e30914675421ac5d047c48f444
+  data.tar.gz: 9e48acecc7a03c5566df08aba20773574ac8d3848093ea4b420c30ab57af16f548518c5c05e9792d2a0588ef42b51b84ac7ef888cf49bc221ed7c7110e576329

data/lib/megam/api/marketplaces.rb

@@ -19,12 +19,12 @@ module Megam
         :expects  => 200,
         :method   => :get,
         :body     => @options[:body]
-      )     
+      )
     end
 
-    def post_marketplaceapp(new_node)
+    def post_marketplaceapp(catitem)
       @options = {:path => '/marketplaces/content',
-        :body => Megam::JSONCompat.to_json(new_node)}.merge(@options)
+        :body => Megam::JSONCompat.to_json(catitem)}.merge(@options)
 
       request(
         :expects  => 201,
@@ -35,8 +35,8 @@ module Megam
 
     #Yet to be tested
     # DELETE /marketplacess/:node_id
-    def delete_marketplaceapp(node_id)
-      @options = {:path => '/marketplaces/#{node_id}',
+    def delete_marketplaceapp(catitem_id)
+      @options = {:path => '/marketplaces/#{catitem_id}',
         :body => ""}.merge(@options)
 
       request(

data/lib/megam/api/version.rb

@@ -1,5 +1,5 @@
 module Megam
   class API
-    VERSION = "0.43"
+    VERSION = "0.44"
   end
 end

data/lib/megam/core/marketplace.rb

@@ -20,14 +20,12 @@ module Megam
     def initialize(email=nil, api_key=nil)
       @id = nil
       @name = nil
-      @appdetails = {}
-      @features={}
+      @catalog = {}
       @plans=nil
-      @applinks={}
-      @attach =nil
-      @predefnode=nil
+      @cattype =nil
+      @predef =nil
       @some_msg = {}
-      @approved = nil
+      @status = nil
       @created_at = nil
       super(email, api_key)
     end
@@ -45,11 +43,11 @@ module Megam
       end
     end
 
-    def appdetails(arg=nil)
+    def catalog(arg=nil)
       if arg != nil
-        @appdetails = arg
+        @catalog = arg
       else
-      @appdetails
+      @catalog
       end
     end
 
@@ -61,13 +59,6 @@ module Megam
       end
     end
 
-    def features(arg=nil)
-      if arg != nil
-        @features = arg
-      else
-      @features
-      end
-    end
 
     def plans(arg=nil)
       if arg != nil
@@ -77,35 +68,28 @@ module Megam
       end
     end
 
-    def applinks(arg=nil)
-      if arg != nil
-        @applinks = arg
-      else
-      @applinks
-      end
-    end
 
-    def predefnode(arg=nil)
+    def predef(arg=nil)
       if arg != nil
-        @predefnode = arg
+        @predef = arg
       else
-      @predefnode
+      @predef
       end
     end
 
-    def attach(arg=nil)
+    def cattype(arg=nil)
       if arg != nil
-        @attach = arg
+        @cattype = arg
       else
-      @attach
+      @cattype
       end
     end
 
-    def approved(arg=nil)
+    def status(arg=nil)
       if arg != nil
-        @approved = arg
+        @status = arg
       else
-      @approved
+      @status
       end
     end
 

data/test/test_marketplaces.rb

@@ -1,101 +1,28 @@
 require File.expand_path("#{File.dirname(__FILE__)}/test_helper")
 
 class TestMarketplaces < MiniTest::Unit::TestCase
-=begin
-def test_post_marketplace
+
+  def test_post_marketplace
     tmp_hash = {
-      "name" => "sample",
-      "appdetails" => {"logo" => "logo", "category"=> "catagroy", "description"=> "description"},
-      "features" => {"feature1" => "feature1","feature2" => "feature2","feature3" => "feature3","feature4" => "feature4"},
+      "name" => "34-Trac",
+      "catalog" => {"logo" => "logo", "category"=> "catagroy", "description"=> "description"},
       "plans" => [{"price"=> "30", "description"=> "description", "plantype"=> "paid", "version"=> "0.1", "source"=> "source"}],
-      "applinks" => {"free_support"=> "String", "paid_support"=> "String", "home_link"=> "String", "info_link"=> "String", "content_link"=> "String", "wiki_link"=> "String", "source_link"=> "String"},
-      "attach" => "attach",
-      "predefnode" => "predefnode",
-      "approved" => "approved" }
+      "cattype" => "DEW",
+      "predefnode" => "java",
+      "status" => "ACTIVE" }
 
     response = megams.post_marketplaceapp(tmp_hash)
     assert_equal(201, response.status)
   end
-=end
-=begin
-  def test_post_node2
-    tmp_hash = {
-      "node_name" => "sundown.megam.co",
-      "command" => "commands2",
-      "predefs" => {"name" => "rails", "scm" => "https://github.com/awesome.git",
-        "db" => "postgres@postgresql2.megam.com/morning.megam.co", "war" => "http://s3pub.com/0.1/orion.war", "queue" => "rabbit@queue1"}
-    }
-    response = megams.post_node(tmp_hash)
-    assert_equal(201, response.status)
-  end
 
   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")    
-    assert_equal(200, response.status)
-  end
-#=end
-=begin
-  def test_get_node1
-    response = megams.get_node("night.megam.co")
-    assert_equal(200, response.status)
-  end
 
-  def test_get_node_not_found
-    assert_raises(Megam::API::Errors::NotFound) do
-      megams.get_node("stupid.megam.co")
-    end
+ def test_get_marketplace
+    response = megams.get_marketplaceapp("34-Trac")
+    assert_equal(200, response.status)
   end
 
-  def test_delete_node1
-
-    @com = {
-"systemprovider" => {
-"provider" => {
-"prov" => "chef"
-}
-},
-"compute" => {
-"cctype" => "ec2",
-"cc" => {
-"groups" => "",
-"image" => "",
-"flavor" => "",
-"tenant_id" => ""
-},
-"access" => {
-"ssh_key" => "megam_ec2",
-"identity_file" => "~/.ssh/megam_ec2.pem",
-"ssh_user" => "",
-"vault_location" => "https://s3-ap-southeast-1.amazonaws.com/cloudkeys/megam@mypaas.io/default",
-"sshpub_location" => "",
-"zone" => "",
-"region" => "region"
-}
-},
-"cloudtool" => {
-"chef" => {
-"command" => "knife",
-"plugin" => "ec2 server delete", #ec2 server delete or create
-"run_list" => "",
-"name" => ""
-}
-}
-}
-
-    tmp_hash = {
-      "node_name" => "black1.megam.co",
-      "req_type" => "delete", #CREATE OR DELETE
-      "command" => @com
-    }
-
-    response = megams.post_request(tmp_hash)
-    assert_equal(201, response.status)
-  end
-=end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: megam_api
 version: !ruby/object:Gem::Version
-  version: '0.43'
+  version: '0.44'
 platform: ruby
 authors:
 - Rajthilak, Kishorekumar Neelamegam, Thomas Alrin, Yeshwanth Kumar, Subash Sethurajan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-01 00:00:00.000000000 Z
+date: 2015-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon