megam_api 0.15 → 0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f70bad4104531f59a86d0a85bf96c1f855c0c96e
-  data.tar.gz: 1ec8eb2603e2f632b47352f05be0407786d9f53c
+  metadata.gz: 09998b376d64a74fe84a95ed4cbb426827e7d853
+  data.tar.gz: 6e69181f6b9a5e77358f957d37b7c011c2efddda
 SHA512:
-  metadata.gz: 8c01a6c03db68969107623032db64ee3c37d1ec706ea83478137a041ecb7844cdaf614bc4e28b76984533686b5fc6079667a51ac02489f8190ecacee88b0a978
-  data.tar.gz: 71f7dc9c679c313976733140c50c049fb21577c98c4354fb3711dd549bc24154c447b201adc00ed4565da885b0f2c4889fc02a87560f566ee4a66f5f392d3100
+  metadata.gz: f1bd5cc89a3851223ddbb64e8a60fbda88cc68c60854f569715cd0eeb3ab10e67393697854dc9b7273e12c852385fa8e54a85794a2d356deccafcc019d6772cf
+  data.tar.gz: 69f3175a199fc9614099969ac8150ab78f56244f0b5ca27c2bbea545a524a6183de60e5e5c4276fc5653a1823264acff36b40ebd79bc1eb4d2d13f74067d519e

data/README.md

@@ -1,13 +1,15 @@
 Megam Ruby Client
 ==================
 
-The Megam Ruby Client is used to interact with the Megam API from Ruby.
+[![Gem Version](https://badge.fury.io/rb/megam_api.svg)](http://badge.fury.io/rb/megam_api)
 
-For more about the Megam API see <http://docs.megam.co>.[Megam API server](https://github.com/indykish/megam_play.git)
+Megam Ruby Client is used to interact with the Megam API Server.
+
+For more about the Megam' REST API <http://gomegam.com/docs>.[Megam API server](https://github.com/indykish/megam_play.git)
 
 [![Build Status](https://travis-ci.org/indykish/megam_api.png)](https://travis-ci.org/indykish/megam_api)
 
-For early access [register at:](https://www.megam.co)
+We are on beta [register at:](https://www.megam.co)
 
 Usage
 -----
@@ -32,14 +34,10 @@ For additional details about any of the commands, see the [API docs](http://docs
     megam.get_nodes                              # get a list of your nodes
     megam.get_node(POGO)                         # get info about the node named POGO
     megam.create_node('name' => POGO, 
-    'type' => 'rails')  				         # create an nodep with a generated name and the default type
+    'type' => 'rails')  			 # create an nodep with a generated name and the default type
     megam.delete_node(POGO)                      # delete the node named POGO
 
 
-### Logs
-
-    megam.get_logs('node' => POGO)               # stream logs information for POGO Node
-
 ### Predefs
 
     megam.get_predefs                             # list all predefs 
@@ -53,11 +51,11 @@ For additional details about any of the commands, see the [API docs](http://docs
 
 We are glad to help if you have questions, or request for new features.
 
-[twitter](http://twitter.com/indykish) [email](<alrin@megam.co.in>)
+[twitter](http://twitter.com/megamsys) [email](<alrin@megam.co.in>)
 
 #### TO - DO
 
-* Interface to [megam_play](https://github.com/indykish/megam_play) 
+*  
 	
 # License
 

data/lib/megam/api.rb

@@ -31,6 +31,7 @@ require "megam/api/cloud_tool_settings"
 require "megam/api/sshkeys"
 require "megam/api/marketplaces"
 require "megam/api/marketplace_addons"
+require "megam/api/csars"
 require "megam/core/server_api"
 require "megam/core/config"
 require "megam/core/stuff"
@@ -73,10 +74,9 @@ require "megam/core/marketplace"
 require "megam/core/marketplace_collection"
 require "megam/core/marketplace_addon"
 require "megam/core/marketplace_addon_collection"
-
-#we may nuke logs out of the api
-#require "megam/api/logs"
-
+require "megam/core/csar"
+require "megam/core/csar_collection"
+require "megam/core/konipai"
 
 
 module Megam
@@ -85,6 +85,13 @@ module Megam
     #text is used to print stuff in the terminal (message, log, info, warn etc.)
     attr_accessor :text
 
+    API_MEGAM_CO = "api.megam.co".freeze
+    API_VERSION2 = "/v2".freeze
+
+    X_Megam_DATE = "X-Megam-DATE".freeze
+    X_Megam_HMAC = "X-Megam-HMAC".freeze
+    X_Megam_OTTAI = "X-Megam-OTTAI".freeze
+
     HEADERS = {
       'Accept' => 'application/json',
       'Accept-Encoding' => 'gzip',
@@ -95,11 +102,11 @@ module Megam
 
     OPTIONS = {
       :headers => {},
-      :host => 'api.megam.co',
+      :host => API_MEGAM_CO,
       :nonblock => false,
       :scheme => 'https'
     }
-    API_VERSION1 = "/v1"
+
 
     def text
       @text ||= Megam::Text.new(STDOUT, STDERR, STDIN, {})
@@ -118,11 +125,11 @@ module Megam
     # 3. Upon merge of the options, the api_key, email as available in the @options is deleted.
     def initialize(options={})
       @options = OPTIONS.merge(options)
-if File.exist?("#{ENV['MEGAM_HOME']}/nilavu.yml")
-        @common = YAML.load_file("#{ENV['MEGAM_HOME']}/nilavu.yml")                  #COMMON YML
-        @options[:host] = "#{@common["api"]["host"]}"
-        @options[:scheme] = "#{@common["api"]["scheme"]}"
-end
+      if File.exist?("#{ENV['MEGAM_HOME']}/nilavu.yml")
+          @common = YAML.load_file("#{ENV['MEGAM_HOME']}/nilavu.yml")                  #COMMON YML
+          @options[:host] = "#{@common["api"]["host"]}"
+          @options[:scheme] = "#{@common["api"]["scheme"]}"
+        end
       @api_key = @options.delete(:api_key) || ENV['MEGAM_API_KEY']
       @email = @options.delete(:email)
       raise ArgumentError, "You must specify [:email, :api_key]" if @email.nil? || @api_key.nil?
@@ -136,8 +143,8 @@ end
         Megam::Log.debug("> #{pkey}: #{pvalue}")
       end
 
-      begin            
-        response = connection.request(params, &block)        
+      begin
+        response = connection.request(params, &block)
       rescue Excon::Errors::HTTPStatusError => error
         klass = case error.response.status
 
@@ -170,14 +177,20 @@ end
 
       if response.body && !response.body.empty?
         if response.headers['Content-Encoding'] == 'gzip'
+          Megam::Log.debug("RESPONSE: Content-Encoding is gzip")
           response.body = Zlib::GzipReader.new(StringIO.new(response.body)).read
         end
         Megam::Log.debug("RESPONSE: HTTP Body(JSON)")
         Megam::Log.debug("#{response.body}")
 
         begin
-          response.body = Megam::JSONCompat.from_json(response.body.chomp)
-          Megam::Log.debug("RESPONSE: Ruby Object")
+          unless response.headers[X_Megam_OTTAI]
+            response.body = Megam::JSONCompat.from_json(response.body.chomp)
+            Megam::Log.debug("RESPONSE: Ruby Object")
+          else
+            response.body = Megam::KoniPai.new.koni(response.body.chomp)
+            Megam::Log.debug("RESPONSE: KoniPai Object ")
+          end
           Megam::Log.debug("#{response.body}")
         rescue Exception => jsonerr
           Megam::Log.error(jsonerr)
@@ -196,18 +209,19 @@ end
       text.msg "--> #{text.color('(#{path})', :cyan,:bold)}"                  # Why " inside "
     end
 
+
+
     #Make a lazy connection.
     def connection
-      @options[:path] =API_VERSION1+ @options[:path]
+      @options[:path] =API_VERSION2+ @options[:path]
       encoded_api_header = encode_header(@options)
       @options[:headers] = HEADERS.merge({
-        'X-Megam-HMAC' => encoded_api_header[:hmac],
-        'X-Megam-Date' => encoded_api_header[:date],
+        X_Megam_HMAC => encoded_api_header[:hmac],
+        X_Megam_DATE => encoded_api_header[:date],
       }).merge(@options[:headers])
                   #COMMON YML
         if @options[:scheme] == "https"
-puts "=====> if https =======>"
-      Excon.defaults[:ssl_ca_file] = File.expand_path(File.join("#{ENV['MEGAM_HOME']}", "#{@common["api"]["pub_key"]}")) || File.expand_path(File.join(File.dirname(__FILE__), "..", "certs", "cacert.pem"))                  #COMMON YML
+          Excon.defaults[:ssl_ca_file] = File.expand_path(File.join("#{ENV['MEGAM_HOME']}", "#{@common["api"]["pub_key"]}")) || File.expand_path(File.join(File.dirname(__FILE__), "..", "certs", "cacert.pem"))                  #COMMON YML
 
       if !File.exist?(File.expand_path(File.join("#{ENV['MEGAM_HOME']}", "#{@common["api"]["pub_key"]}")))
         text.warn("Certificate file does not exist. SSL_VERIFY_PEER set as false")

data/lib/megam/api/csars.rb

@@ -0,0 +1,50 @@
+module Megam
+  class API
+
+    # GET /csars
+    def get_csars
+      @options = {:path => '/csars',:body => ""}.merge(@options)
+
+      request(
+        :expects  => 200,
+        :method   => :get,
+        :body     => @options[:body]
+      )
+    end
+
+    def get_csar(id)
+      @options = {:path => "/csars/#{id}",:body => ""}.merge(@options)
+
+      request(
+        :expects  => 200,
+        :method   => :get,
+        :body     => @options[:body]
+      )
+    end
+
+    def post_csar(new_csar)
+      @options = {:path => '/csars/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.15"
+    VERSION = "0.16"
   end
 end

data/lib/megam/builder/delete_node.rb

@@ -1,4 +1,4 @@
-# Copyright:: Copyright (c) 2012, 2013 Megam Systems
+# Copyright:: Copyright (c) 2012, 2014 Megam Systems
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/megam/builder/make_node.rb

@@ -1,4 +1,4 @@
-# Copyright:: Copyright (c) 2012, 2013 Megam Systems
+# Copyright:: Copyright (c) 2012, 2014 Megam Systems
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/megam/core/app_request.rb

@@ -1,4 +1,4 @@
-# Copyright:: Copyright (c) 2012, 2013 Megam Systems
+# Copyright:: Copyright (c) 2012, 2014 Megam Systems
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/megam/core/app_request_collection.rb

@@ -1,4 +1,4 @@
-# Copyright:: Copyright (c) 2012, 2013 Megam Systems
+# Copyright:: Copyright (c) 2012, 2014 Megam Systems
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/megam/core/appdefns.rb

@@ -1,4 +1,4 @@
-# Copyright:: Copyright (c) 2012, 2013 Megam Systems
+# Copyright:: Copyright (c) 2012, 2014 Megam Systems
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/megam/core/appdefns_collection.rb

@@ -1,4 +1,4 @@
-# Copyright:: Copyright (c) 2012, 2013 Megam Systems
+# Copyright:: Copyright (c) 2012, 2014 Megam Systems
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/megam/core/bolt_request.rb

@@ -1,4 +1,4 @@
-# Copyright:: Copyright (c) 2012, 2013 Megam Systems
+# Copyright:: Copyright (c) 2012, 2014 Megam Systems
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/megam/core/bolt_request_collection.rb

@@ -1,4 +1,4 @@
-# Copyright:: Copyright (c) 2012, 2013 Megam Systems
+# Copyright:: Copyright (c) 2012, 2014 Megam Systems
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/megam/core/boltdefns.rb

@@ -1,4 +1,4 @@
-# Copyright:: Copyright (c) 2012, 2013 Megam Systems
+# Copyright:: Copyright (c) 2012, 2014 Megam Systems
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/megam/core/boltdefns_collection.rb

@@ -1,4 +1,4 @@
-# Copyright:: Copyright (c) 2012, 2013 Megam Systems
+# Copyright:: Copyright (c) 2012, 2014 Megam Systems
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/megam/core/cloudinstruction.rb

@@ -1,4 +1,4 @@
-# Copyright:: Copyright (c) 2012, 2013 Megam Systems
+# Copyright:: Copyright (c) 2012, 2014 Megam Systems
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/megam/core/cloudinstruction_collection.rb

@@ -1,4 +1,4 @@
-# Copyright:: Copyright (c) 2012, 2013 Megam Systems
+# Copyright:: Copyright (c) 2012, 2014 Megam Systems
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/megam/core/cloudinstruction_group.rb

@@ -1,4 +1,4 @@
-# Copyright:: Copyright (c) 2012, 2013 Megam Systems
+# Copyright:: Copyright (c) 2012, 2014 Megam Systems
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/megam/core/cloudtemplate.rb

@@ -1,4 +1,4 @@
-# Copyright:: Copyright (c) 2012, 2013 Megam Systems
+# Copyright:: Copyright (c) 2012, 2014 Megam Systems
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/megam/core/cloudtemplate_collection.rb

@@ -1,4 +1,4 @@
-# Copyright:: Copyright (c) 2012, 2013 Megam Systems
+# Copyright:: Copyright (c) 2012, 2014 Megam Systems
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/megam/core/cloudtool.rb

@@ -1,4 +1,4 @@
-# Copyright:: Copyright (c) 2012, 2013 Megam Systems
+# Copyright:: Copyright (c) 2012, 2014 Megam Systems
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/megam/core/cloudtool_collection.rb

@@ -1,4 +1,4 @@
-# Copyright:: Copyright (c) 2012, 2013 Megam Systems
+# Copyright:: Copyright (c) 2012, 2014 Megam Systems
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/megam/core/cloudtoolsetting.rb

@@ -1,4 +1,4 @@
-# Copyright:: Copyright (c) 2012, 2013 Megam Systems
+# Copyright:: Copyright (c) 2012, 2014 Megam Systems
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/megam/core/cloudtoolsetting_collection.rb

@@ -1,4 +1,4 @@
-# Copyright:: Copyright (c) 2012, 2013 Megam Systems
+# Copyright:: Copyright (c) 2012, 2014 Megam Systems
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/megam/core/config.rb

@@ -20,14 +20,14 @@ module Megam
   class Config
 
     extend Mixlib::Config
-    
+
     def self.inspect
       configuration.inspect
     end
 
     megam_api_server_url   "http://localhost:9000"
-    
-    megam_api_version      "v1"
+
+    megam_api_version      "v2"
 
     email nil
     api_key nil

data/lib/megam/core/csar.rb

@@ -0,0 +1,165 @@
+# Copyright:: Copyright (c) 2012, 2014 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 CSAR < Megam::ServerAPI
+    def initialize(email=nil, api_key=nil)
+      @id = nil
+      @desc = nil
+      @link = {}
+      @some_msg = {}
+      @created_at = nil
+      super(email, api_key)
+    end
+
+    def csar
+      self
+    end
+
+    def id(arg=nil)
+      if arg != nil
+        @id = arg
+      else
+        @id
+      end
+    end
+
+    def desc(arg=nil)
+      if arg != nil
+        @desc = arg
+      else
+      @desc
+      end
+    end
+
+
+    def link(arg=nil)
+      if arg != nil
+        @link = arg
+      else
+      @link
+      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["desc"] = desc
+      index_hash["link"] = link
+      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,
+        "desc" => desc,
+        "link" => link,
+        "created_at" => created_at
+      }
+      result
+    end
+
+    def self.json_create(o)
+      csarjslf = new
+      csarjslf.id(o["id"]) if o.has_key?("id")
+      csarjslf.desc(o["desc"]) if o.has_key?("desc")
+      csarjslf.link(o["link"]) if o.has_key?("link")
+
+      #success or error
+      csarjslf.some_msg[:code] = o["code"] if o.has_key?("code")
+      csarjslf.some_msg[:msg_type] = o["msg_type"] if o.has_key?("msg_type")
+      csarjslf.some_msg[:msg]= o["msg"] if o.has_key?("msg")
+      csarjslf.some_msg[:links] = o["links"] if o.has_key?("links")
+
+      csarjslf
+    end
+
+    def self.from_hash(o,tmp_email=nil, tmp_api_key=nil)
+      csarhslf = self.new(tmp_email, tmp_api_key)
+      csarhslf.from_hash(o)
+      csarhslf
+    end
+
+    def from_hash(o)
+      @id        = o["id"] if o.has_key?("id")
+      @desc      = o["desc"] if o.has_key?("desc")
+      @link      = o["link"] if o.has_key?("link")
+      @created_at = o["created_at"] if o.has_key?("created_at")
+      self
+    end
+
+    #This won't work, as the body just needs the yaml string.
+    def self.create(o,tmp_email=nil, tmp_api_key=nil)
+      csarslf = from_hash(o, tmp_email, tmp_api_key)
+      csarslf.create
+    end
+
+    # Create the csar yaml
+    #This won't work, as the body just needs the yaml string.
+    def create
+      megam_rest.post_csar(to_hash)
+    end
+
+    # Load the yaml back from the link
+    def self.show(tmp_email=nil, tmp_api_key=nil, csarlink_name)
+      csarslf = self.new(tmp_email, tmp_api_key)
+      csarslf.megam_rest.get_csar(csarlink_name)
+    end
+
+    #list all csars (links)
+    def self.list(tmp_email=nil, tmp_api_key=nil)
+      csarslf = self.new(tmp_email, tmp_api_key)
+      csarslf.megam_rest.get_csars
+    end
+
+    def to_s
+      Megam::Stuff.styled_hash(to_hash)
+    end
+
+  end
+end