megam_api 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7fec9b83d86dbf90747da9bc441fcd090f15f2b
-  data.tar.gz: 24c8f581bb48ce1b094bdca1995219ec37daa591
+  metadata.gz: ea07146eea7fd29325b48224874415a83953875e
+  data.tar.gz: e0fc1cc6c4220220b5ca3fedab8fde4f6e2ef492
 SHA512:
-  metadata.gz: 31c0aa4dcadca1422d6d51406d5f73efae369838ef630960b635cabc66be7ebb3dcf2ff16e321bca94855645e47b0a3629e690075df3ac5c77a0bcf9882830ab
-  data.tar.gz: e35d039644391bb7cabf6b2570b4d23330cd6787c0268e079f35b1c16a29414faf4c2ee90ba376202457724fea07b97f7051f690a3dc378a2eeb9d935a28d367
+  metadata.gz: c3cfea38cfcfbaf3ba37d3dc29fccb848977f48ca79430feda954b70db0fa6e1cce030e45955ba998d172974de1505dda56017042f87db81f93f9317feefc44d
+  data.tar.gz: fc0faa8e998c1901e506665cce2139091924fcf6531f6d944150c7854ddcd02ed7caf6446362b87d43e0f4a631bc3ddb5cdef8418ca02153b22a42d929c62823

data/lib/megam/api.rb

@@ -28,6 +28,7 @@ require "megam/api/predef_clouds"
 require "megam/api/cloud_tools"
 require "megam/api/cloud_tool_settings"
 require "megam/api/sshkeys"
+require "megam/api/marketplaces"
 require "megam/core/server_api"
 require "megam/core/config"
 require "megam/core/stuff"
@@ -66,6 +67,8 @@ require "megam/core/cloudtoolsetting"
 require "megam/core/cloudtoolsetting_collection"
 require "megam/core/sshkey"
 require "megam/core/sshkey_collection"
+require "megam/core/marketplace"
+require "megam/core/marketplace_collection"
 
 #we may nuke logs out of the api
 #require "megam/api/logs"

data/lib/megam/api/marketplaces.rb

@@ -0,0 +1,50 @@
+module Megam
+  class API
+
+    # GET /nodes
+    def get_marketplaceapps
+      @options = {:path => '/marketplaces',:body => ""}.merge(@options)
+
+      request(
+        :expects  => 200,
+        :method   => :get,
+        :body     => @options[:body]
+      )
+    end
+
+    def get_meraketplaceapp(id)
+      @options = {:path => "/marketplaces/#{id}",:body => ""}.merge(@options)
+
+      request(
+        :expects  => 200,
+        :method   => :get,
+        :body     => @options[:body]
+      )
+    end
+
+    def post_marketplaceapp(new_node)
+      @options = {:path => '/marketplaces/content',
+        :body => Megam::JSONCompat.to_json(new_node)}.merge(@options)
+
+      request(
+        :expects  => 201,
+        :method   => :post,
+        :body     => @options[:body]
+      )
+    end
+
+    #Yet to be tested
+    # DELETE /marketplacess/:node_id
+    def delete_marketplaceapp(node_id)
+      @options = {:path => '/marketplaces/#{node_id}',
+        :body => ""}.merge(@options)
+
+      request(
+        :expects  => 200,
+        :method   => :delete,
+        :body     => @options[:body]
+      )
+    end
+
+  end
+end

data/lib/megam/api/version.rb

@@ -1,5 +1,5 @@
 module Megam
   class API
-    VERSION = "0.8.1"
+    VERSION = "0.8.2"
   end
 end

data/lib/megam/core/error.rb

@@ -26,7 +26,7 @@ module Megam
     end
 
     def megam_rest
-      Megam::API.new(Megam::Config[:email], Megam::Config[:api_key])
+      Megam::Scm.new(Megam::Config[:name], Megam::Config[:displayName], Megam::Config[:mail], Megam::Config[:password])
     end
 
     def some_msg(arg=nil)

data/lib/megam/core/json_compat.rb

@@ -53,6 +53,8 @@ module Megam
     MEGAM_CLOUDINSTRUCTIONGROUP    = "Megam::CloudInstructionGroup".freeze
     MEGAM_SSHKEY       = "Megam::SshKey".freeze
     MEGAM_SSHKEYCOLLECTION    = "Megam::SshKeyCollection".freeze
+    MEGAM_MARKETPLACE       = "Megam::MarketPlace".freeze
+    MEGAM_MARKETPLACECOLLECTION    = "Megam::MarketPlaceCollection".freeze
     class <<self
       # Increase the max nesting for JSON, which defaults
       # to 19, and isn't enough for some (for example, a Node within a Node)
@@ -185,6 +187,10 @@ module Megam
           Megam::SshKey
         when MEGAM_SSHKEYCOLLECTION
           Megam::SshKeyCollection
+        when MEGAM_MARKETPLACE
+          Megam::MarketPlace
+        when MEGAM_MARKETPLACECOLLECTION
+          Megam::MarketPlaceCollection
         else
         raise JSON::ParserError, "Unsupported `json_class` type '#{json_class}'"
         end

data/lib/megam/core/marketplace.rb

@@ -0,0 +1,263 @@
+# 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.
+#
+require 'hashie'
+
+module Megam
+  class MarketPlace < Megam::ServerAPI
+    def initialize(email=nil, api_key=nil)
+      @id = nil
+      @name = nil
+      @logo = nil
+      @catagory = nil
+      @pricetype = nil
+      @features={}
+      @plan={}
+      @attach =nil
+      @predefnode=nil
+      @some_msg = {}      
+      @approved = nil      
+      @created_at = nil
+      super(email, api_key)
+    end
+
+    def market_place
+      self
+    end
+
+    
+    def name(arg=nil)
+      if arg != nil
+        @name = arg
+      else
+      @name
+      end
+    end
+
+    def logo(arg=nil)
+      if arg != nil
+        @logo = arg
+      else
+      @logo
+      end
+    end
+
+    def catagory(arg=nil)
+      if arg != nil
+        @catagory = arg
+      else
+      @catagory
+      end
+    end
+
+    def id(arg=nil)
+      if arg != nil
+        @id = arg
+      else
+      @id
+      end
+    end
+
+    def pricetype(arg=nil)
+      if arg != nil
+        @pricetype = arg
+      else
+      @pricetype
+      end
+    end
+
+    def features(arg=nil)
+      if arg != nil
+        @features = arg
+      else
+      @features
+      end
+    end
+
+    def plan(arg=nil)
+      if arg != nil
+        @plan = arg
+      else
+      @plan
+      end
+    end
+
+    def predefnode(arg=nil)
+      if arg != nil
+        @predefnode = arg
+      else
+      @predefnode
+      end
+    end
+
+    def attach(arg=nil)
+      if arg != nil
+        @attach = arg
+      else
+      @attach
+      end
+    end
+
+    def approved(arg=nil)
+      if arg != nil
+        @approved = arg
+      else
+      @approved
+      end
+    end
+    
+    def created_at(arg=nil)
+      if arg != nil
+        @created_at = arg
+      else
+      @created_at
+      end
+    end
+
+    def some_msg(arg=nil)
+      if arg != nil
+        @some_msg = arg
+      else
+      @some_msg
+      end
+    end
+
+    def error?
+      crocked  = true if (some_msg.has_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["logo"] = logo
+      index_hash["catagory"] = catagory
+      index_hash["pricetype"] = pricetype
+      index_hash["features"] = features
+      index_hash["plan"] = plan
+      index_hash["attach"] = attach
+      index_hash["predefnode"] = predefnode
+      index_hash["approved"] = approved      
+      index_hash["some_msg"] = some_msg      
+      index_hash["created_at"] = created_at
+      index_hash
+    end
+
+    # Serialize this object as a hash: called from JsonCompat.
+    # Verify if this called from JsonCompat during testing.
+    def to_json(*a)
+      for_json.to_json(*a)
+    end
+
+    def for_json
+      result = {
+        "id" => id,
+        "name" => name,
+        "logo" => logo,
+        "catagory" => catagory,
+        "pricetype" => pricetype,
+        "features" => features,
+        "plan" => plan,
+        "attach" => attach,
+        "predefnode" => predefnode,
+        "approved" => approved,        
+        "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.logo(o["logo"]) if o.has_key?("logo")
+      app.catagory(o["catagory"]) if o.has_key?("catagory")
+      app.pricetype(o["pricetype"]) if o.has_key?("pricetype")   
+      app.attach(["attach"]) if o.has_key?("attach")
+      app.predefnode(o["predefnode"]) if o.has_key?("predefnode")
+      app.approved(o["approved"]) if o.has_key?("approved")
+      app.created_at(o["created_at"]) if o.has_key?("created_at")
+      #requests
+      oq = o["features"]
+      app.features[:feature1] = oq["feature1"] if oq && oq.has_key?("feature1")
+      app.features[:feature2] = oq["feature2"] if oq && oq.has_key?("feature2")
+      app.features[:feature3] = oq["feature3"] if oq && oq.has_key?("feature3")
+      app.features[:feature4] = oq["feature4"] if oq && oq.has_key?("feature4")
+    
+      op = o["plan"]
+      app.plan[:price] = op["price"] if op && op.has_key?("price")
+      app.plan[:description] = op["description"] if op && op.has_key?("description")
+      app.plan[:plantype]= op["plantype"] if op && op.has_key?("plantype")    
+      
+      #success or error
+      app.some_msg[:code] = o["code"] if o.has_key?("code")
+      app.some_msg[:msg_type] = o["msg_type"] if o.has_key?("msg_type")
+      app.some_msg[:msg]= o["msg"] if o.has_key?("msg")
+      app.some_msg[:links] = o["links"] if o.has_key?("links")
+
+      app
+    end
+
+    def self.from_hash(o,tmp_email=nil, tmp_api_key=nil)
+      app = self.new(tmp_email, tmp_api_key)
+      app.from_hash(o)
+      app
+    end
+
+    def from_hash(o)
+      @name = o["name"] if o.has_key?("name")
+      @catagory   = o["catagory"] if o.has_key?("catagory")
+      @id        = o["id"] if o.has_key?("id")
+      @logo    = o["logo"] if o.has_key?("logo")
+      @pricetype    = o["pricetype"] if o.has_key?("pricetype")
+      @features    = o["features"] if o.has_key?("features")
+      @plan   = o["plan"] if o.has_key?("plan")
+      @attach   = o["attach"] if o.has_key?("attach")
+      @predefnode   = o["predefnode"] if o.has_key?("predefnode")
+      @approved   = o["approved"] if o.has_key?("approved")      
+      @created_at        = o["created_at"] if o.has_key?("created_at")
+      self
+    end
+
+    def self.create(o,tmp_email=nil, tmp_api_key=nil)
+      acct = from_hash(o, tmp_email, tmp_api_key)
+      acct.create
+    end
+
+    # Create the marketplace app via the REST API
+    def create
+      megam_rest.post_marketplaceapp(to_hash)
+    end
+
+    # Load a account by email_p
+    def self.show(name, tmp_email=nil, tmp_api_key=nil)
+      app = self.new(tmp_email, tmp_api_key)
+      app.megam_rest.get_marketplaceapp(name)
+    end
+
+    def self.list(tmp_email=nil, tmp_api_key=nil)
+      app = self.new(tmp_email, tmp_api_key)
+      app.megam_rest.get_marketplaceapps
+    end
+
+    def to_s
+      Megam::Stuff.styled_hash(to_hash)
+    #"---> Megam::Account:[error=#{error?}]\n"+
+    end
+
+  end
+end

data/lib/megam/core/marketplace_collection.rb

@@ -0,0 +1,148 @@
+# 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
+  class MarketPlaceCollection
+    include Enumerable
+
+    
+    attr_reader :iterator
+    def initialize
+      @apps = Array.new
+      @apps_by_name = Hash.new
+      @insert_after_idx = nil
+    end
+
+    def all_apps
+      @apps
+    end
+
+    def [](index)
+      @apps[index]
+    end
+
+    def []=(index, arg)
+      is_megam_app(arg)
+      @apps[index] = arg
+      @apps_by_name[arg.name] = index
+    end
+
+    def <<(*args)
+      args.flatten.each do |a|
+        is_megam_app(a)
+        @apps << a
+        @apps_by_name[a.name] = @apps.length - 1
+      end
+      self
+    end
+
+    # 'push' is an alias method to <<
+    alias_method :push, :<<
+
+    def insert(app)
+      is_megam_app(app)
+      if @insert_after_idx
+        # in the middle of executing a run, so any nodes inserted now should
+        # be placed after the most recent addition done by the currently executing
+        # node
+        @apps.insert(@insert_after_idx + 1, app)
+        # update name -> location mappings and register new node
+        @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
+        @insert_after_idx += 1
+      else
+      @apps << app
+      @apps_by_name[app.name] = @apps.length - 1 
+      end
+    end
+
+    def each
+      @apps.each do |app|
+        yield app
+      end
+    end
+
+    def each_index
+      @apps.each_index do |i|
+        yield i
+      end
+    end
+
+    def empty?
+      @apps.empty?
+    end
+
+    def lookup(app)
+      lookup_by = nil
+      if app.kind_of?(Megam::MarketPlace)
+      lookup_by = app.name
+      elsif app.kind_of?(String)
+      lookup_by = app
+      else
+        raise ArgumentError, "Must pass a Megam::MarketPlace or String to lookup"
+      end
+      res = @apps_by_name[lookup_by]
+      unless res
+        raise ArgumentError, "Cannot find a app matching #{lookup_by} (did you define it first?)"
+      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
+      end
+      index_hash
+    end
+
+    # Serialize this object as a hash: called from JsonCompat.
+    # Verify if this called from JsonCompat during testing.
+    def to_json(*a)
+      for_json.to_json(*a)
+    end
+
+
+    def self.json_create(o)
+      collection = self.new()
+      o["results"].each do |apps_list|
+        apps_array = apps_list.kind_of?(Array) ? apps_list : [ apps_list ]
+        apps_array.each do |app|
+          collection.insert(app)
+        end
+      end
+      collection
+    end
+
+    private
+
+    
+    
+    def is_megam_app(arg)
+      unless arg.kind_of?(Megam::MarketPlace)
+        raise ArgumentError, "Members must be Megam::MarketPlace's"
+      end
+      true
+    end
+
+    def to_s
+      Megam::Stuff.styled_hash(to_hash)
+    end
+
+  end
+end

data/test/test_marketplaces.rb

@@ -0,0 +1,100 @@
+require File.expand_path("#{File.dirname(__FILE__)}/test_helper")
+
+class TestMarketplaces < MiniTest::Unit::TestCase
+=begin
+def test_post_marketplace
+    tmp_hash = {      
+      "name" => "sample",
+      "logo" => "riak.logo",
+      "catagory" => "DB",
+      "pricetype" => "free",
+      "features" => {"feature1" => "feature1","feature2" => "feature2","feature3" => "feature3","feature4" => "feature4"},
+      "plan" => {"price" => "50","description" => "description","plantype" => "free"},
+      "attach" => "attach",
+      "predefnode" => "predefnode",
+      "approved" => "approved" }
+
+    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
+=end
+  def test_get_marketplaces
+    response = megams.get_marketplaceapps
+    assert_equal(200, response.status)
+  end
+=begin
+  def test_get_node0
+    response = megams.get_node("black1.megam.co")
+    assert_equal(200, response.status)
+  end
+
+  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
+  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/sandy@megamsandbox.com/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.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Kishorekumar Neelamegam, Thomas Alrin, Subash Sethurajan, Rajthilak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-17 00:00:00.000000000 Z
+date: 2014-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -138,6 +138,7 @@ files:
 - lib/megam/api/errors.rb
 - lib/megam/api/login.rb
 - lib/megam/api/logs.rb
+- lib/megam/api/marketplaces.rb
 - lib/megam/api/nodes.rb
 - lib/megam/api/predef_clouds.rb
 - lib/megam/api/predefs.rb
@@ -169,6 +170,8 @@ files:
 - lib/megam/core/error.rb
 - lib/megam/core/json_compat.rb
 - lib/megam/core/log.rb
+- lib/megam/core/marketplace.rb
+- lib/megam/core/marketplace_collection.rb
 - lib/megam/core/monologger.rb
 - lib/megam/core/node.rb
 - lib/megam/core/node_collection.rb
@@ -196,6 +199,7 @@ files:
 - test/test_helper.rb
 - test/test_login.rb
 - test/test_logs.rb
+- test/test_marketplaces.rb
 - test/test_nodes.rb
 - test/test_predefclouds.rb
 - test/test_predefs.rb
@@ -221,7 +225,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Ruby Client for the Megam Cloud