megam_api 0.7.9 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 770ab35153e2d560927412af49b8394e6558f46f
-  data.tar.gz: d56bc2b84f1d9bfe2aaa14f0486fa6751c7854d3
+  metadata.gz: c0001f507173e65034c03d8b4e2ddc93e856aff4
+  data.tar.gz: 43137c2ac2f362c21f0561b3d90cef17dd380301
 SHA512:
-  metadata.gz: 9b78257ac885ba2190f3fb2e461b7bd144d8a16e62c1198f195ae74f7ff333bbdf2615c5b5c5af94983745c7465a4526ec2b5952d6eaf1dd629c77d51d16ea6b
-  data.tar.gz: eda1bbd9afed71d9e3b2f86d22e6fc5dc468e846bef41bebdd88c80c4216ae9b4ad0796970b3ada412bf5014cef7398df33afa045c2682632b0b16909c4db4bb
+  metadata.gz: 3b7cb2d6fd275d8dc21546bf058e2d8c6a1a9efe5c5d4c46132df4bc46a4b30db05b0bd269690a1071a0d4bf6c4447c1442270afb3dd330542b5d1ac17eda33e
+  data.tar.gz: b7b73b4252f19260679771c83e42400011bf3d778c091b2e1a39ad5fb80bc8cbf285584cfd2b18c23775c11a1908805469185a9366679b83fe11e92024703d17

data/lib/megam/api/sshkeys.rb

@@ -0,0 +1,35 @@
+module Megam
+  class API
+    def get_sshkeys
+      @options = {:path => '/sshkeys',:body => ""}.merge(@options)
+
+      request(
+        :expects  => 200,
+        :method   => :get,
+        :body     => @options[:body]
+      )
+    end
+
+    def get_sshkey(sshkey_name)
+      @options = {:path => "/sshkeys/#{sshkey_name}",:body => ""}.merge(@options)
+
+      request(
+        :expects  => 200,
+        :method   => :get,
+        :body     => @options[:body]
+      )
+    end
+
+    def post_sshkey(new_sshkey)
+      @options = {:path => '/sshkeys/content',
+        :body => Megam::JSONCompat.to_json(new_sshkey)}.merge(@options)
+
+      request(
+        :expects  => 201,
+        :method   => :post,
+        :body     => @options[:body]
+      )
+    end
+
+  end
+end

data/lib/megam/api/version.rb

@@ -1,5 +1,5 @@
 module Megam
   class API
-    VERSION = "0.7.9"
+    VERSION = "0.8.0"
   end
 end

data/lib/megam/api.rb

@@ -27,6 +27,7 @@ require "megam/api/predefs"
 require "megam/api/predef_clouds"
 require "megam/api/cloud_tools"
 require "megam/api/cloud_tool_settings"
+require "megam/api/sshkeys"
 require "megam/core/server_api"
 require "megam/core/config"
 require "megam/core/stuff"
@@ -63,6 +64,8 @@ require "megam/core/cloudinstruction_collection"
 require "megam/core/cloudinstruction"
 require "megam/core/cloudtoolsetting"
 require "megam/core/cloudtoolsetting_collection"
+require "megam/core/sshkey"
+require "megam/core/sshkey_collection"
 
 #we may nuke logs out of the api
 #require "megam/api/logs"

data/lib/megam/builder/delete_node.rb

@@ -49,10 +49,10 @@ module Megam
       ci_command = "#{cloud_instruction.command}"     
       if ci_command["<node_name>"].present?
       ci_command["<node_name>"] = "#{data[:node_name]}"
-      end  
-      if ci_command["-c"].present?
-        ci_command["-c"] = "-c #{cts.conf_location}"
       end       
+      if ci_command["-c"].present?
+        ci_command["-c"] = "-c #{cts.conf_location}"         
+      end          
          command_hash = {
         "systemprovider" => {
           "provider" => {

data/lib/megam/builder/make_node.rb

@@ -100,7 +100,7 @@ module Megam
         "noofinstances" => data[:no_of_instances],
         "command" => command_hash,
         "predefs" => {"name" => data[:predef_name], "scm" => "#{data[:deps_scm]}",
-          "db" => "postgres@postgresql1.megam.com/morning.megam.co", "war" => "#{data[:deps_war]}", "queue" => "queue@queue1", "runtime_exec" => data[:runtime_exec]},
+         "db" => "postgres@postgresql1.megam.com/morning.megam.co", "war" => "#{data[:deps_war]}", "queue" => "queue@queue1", "runtime_exec" => data[:runtime_exec]},
         "appdefns" => {"timetokill" => "", "metered" => "", "logging" => "", "runtime_exec" => ""},
         "boltdefns" => {"username" => "", "apikey" => "", "store_name" => "", "url" => "", "prime" => "", "timetokill" => "", "metered" => "", "logging" => "", "runtime_exec" => ""},
         "appreq" => {},

data/lib/megam/core/json_compat.rb

@@ -51,6 +51,8 @@ module Megam
     MEGAM_CLOUDINSTRUCTION     = "Megam::CloudInstruction".freeze
     MEGAM_CLOUDINSTRUCTIONCOLLECTION    = "Megam::CloudInstructionCollection".freeze
     MEGAM_CLOUDINSTRUCTIONGROUP    = "Megam::CloudInstructionGroup".freeze
+    MEGAM_SSHKEY       = "Megam::SshKey".freeze
+    MEGAM_SSHKEYCOLLECTION    = "Megam::SshKeyCollection".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)
@@ -179,6 +181,10 @@ module Megam
           Megam::CloudInstructionGroup
         when MEGAM_CLOUDINSTRUCTIONCOLLECTION
           Megam::CloudInstructionCollection
+        when MEGAM_SSHKEY
+          Megam::SshKey
+        when MEGAM_SSHKEYCOLLECTION
+          Megam::SshKeyCollection
         else
         raise JSON::ParserError, "Unsupported `json_class` type '#{json_class}'"
         end

data/lib/megam/core/sshkey.rb

@@ -0,0 +1,176 @@
+
+# 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 SshKey < Megam::ServerAPI
+    def initialize(email=nil, api_key=nil)
+      @id = nil
+      @name = nil
+      @accounts_id = nil      
+      @path=nil      
+      @created_at = nil
+      @some_msg = {}
+      super(email, api_key)
+    end
+
+    def sshkey
+      self
+    end
+
+    
+    def id(arg=nil)
+      if arg != nil
+        @id = arg
+      else
+      @id
+      end
+    end
+
+    def name(arg=nil)
+      if arg != nil
+        @name = arg
+      else
+      @name
+      end
+    end
+
+    def accounts_id(arg=nil)
+      if arg != nil
+        @accounts_id= arg
+      else
+      @accounts_id
+      end
+    end
+    
+
+    def path(arg=nil)
+      if arg != nil
+        @path= arg
+      else
+      @path
+      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["accounts_id"] = accounts_id
+      index_hash["path"] = path     
+      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,
+        "accounts_id" => accounts_id,
+        "path" => path,        
+        "created_at" => created_at
+      }
+      result
+    end
+
+    #
+    def self.json_create(o)
+      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.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")
+      sshKey.some_msg[:msg_type] = o["msg_type"] if o.has_key?("msg_type")
+      sshKey.some_msg[:msg]= o["msg"] if o.has_key?("msg")
+      sshKey.some_msg[:links] = o["links"] if o.has_key?("links")
+      sshKey
+    end
+
+    def self.from_hash(o,tmp_email=nil, tmp_api_key=nil)
+      sshKey = self.new(tmp_email, tmp_api_key)
+      sshKey.from_hash(o)
+      sshKey
+    end
+
+    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)   
+      @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 predef via the REST API
+    def create
+      megam_rest.post_sshkey(to_hash)
+    end
+
+    # Load all sshkeys -
+    # returns a sshkeysCollection
+    # don't return self. check if the Megam::SshKeyCollection is returned.
+    def self.list(tmp_email=nil, tmp_api_key=nil)
+    sshKey = self.new(tmp_email,tmp_api_key)
+      sshKey.megam_rest.get_sshkeys
+    end
+
+    # Show a particular sshKey by name,
+    # Megam::SshKey
+    def self.show(p_name,tmp_email=nil, tmp_api_key=nil)
+    pre = self.new(tmp_email,tmp_api_key)
+    pre.megam_rest.get_sshkey(p_name)
+    end
+
+    def to_s
+      Megam::Stuff.styled_hash(to_hash)
+    #"---> Megam::Account:[error=#{error?}]\n"+
+    end
+
+  end
+end

data/lib/megam/core/sshkey_collection.rb

@@ -0,0 +1,144 @@
+# 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 SshKeyCollection
+    include Enumerable
+
+    attr_reader :iterator
+    def initialize
+      @sshkeys = Array.new
+      @sshkeys_by_name = Hash.new
+      @insert_after_idx = nil
+    end
+
+    def all_sshkeys
+      @sshkeys
+    end
+
+    def [](index)
+      @sshkeys[index]
+    end
+
+    def []=(index, arg)
+      is_megam_sshkeys(arg)
+      @sshkeys[index] = arg
+      @sshkeys_by_name[arg.name] = index
+    end
+
+    def <<(*args)
+      args.flatten.each do |a|
+        is_megam_sshkeys(a)
+        @sshkeys << a
+        @sshkeys_by_name[a.name] =@sshkeys.length - 1
+      end
+      self
+    end
+
+    # 'push' is an alias method to <<
+    alias_method :push, :<<
+
+    def insert(sshkeys)
+      is_megam_sshkeys(sshkeys)
+      if @insert_after_idx
+        # in the middle of executing a run, so any sshkeys inserted now should
+        # be placed after the most recent addition done by the currently executing
+        # sshkey
+        @sshkeys.insert(@insert_after_idx + 1, sshkeys)
+        # update name -> location mappings and register new sshkeys
+        @sshkeys_by_name.each_key do |key|
+        @sshkeys_by_name[key] += 1 if@sshkeys_by_name[key] > @insert_after_idx
+        end
+        @sshkeys_by_name[sshkeys.name] = @insert_after_idx + 1
+        @insert_after_idx += 1
+      else
+      @sshkeys << sshkeys
+      @sshkeys_by_name[sshkeys.name] =@sshkeys.length - 1
+      end
+    end
+
+    def each
+      @sshkeys.each do |sshkeys|
+        yield sshkeys
+      end
+    end
+
+    def each_index
+      @sshkeys.each_index do |i|
+        yield i
+      end
+    end
+
+    def empty?
+      @sshkeys.empty?
+    end
+
+    def lookup(sshkeys)
+      lookup_by = nil
+      if sshkeys.kind_of?(Megam::SshKey)
+      lookup_by = sshkeys.name
+      elsif sshkeys.kind_of?(String)
+      lookup_by = sshkeys
+      else
+        raise ArgumentError, "Must pass a Megam::sshkeys or String to lookup"
+      end
+      res =@sshkeys_by_name[lookup_by]
+      unless res
+        raise ArgumentError, "Cannot find a sshkeys matching #{lookup_by} (did you define it first?)"
+      end
+      @sshkeys[res]
+    end
+
+    # Transform the ruby obj ->  to a Hash
+    def to_hash
+      index_hash = Hash.new
+      self.each do |sshkeys|
+        index_hash[sshkeys.name] = sshkeys.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 |sshkeys_list|
+        sshkeys_array = sshkeys_list.kind_of?(Array) ? sshkeys_list : [ sshkeys_list ]
+        sshkeys_array.each do |sshkeys|
+          collection.insert(sshkeys)
+        end
+      end
+      collection
+    end
+
+    private
+
+    def is_megam_sshkeys(arg)
+      unless arg.kind_of?(Megam::SshKey)
+        raise ArgumentError, "Members must be Megam::SshKeys's"
+      end
+      true
+    end
+
+    def to_s
+      Megam::Stuff.styled_hash(to_hash)
+    end
+
+  end
+end

data/test/test_sshkeys.rb

@@ -0,0 +1,35 @@
+require File.expand_path("#{File.dirname(__FILE__)}/test_helper")
+
+class TestApps < MiniTest::Unit::TestCase
+  def test_post_sshkey2
+    tmp_hash = { :name => "test_sample",  :path => "https://s3-ap-southeast-1.amazonaws.com/cloudkeys/sandy@megamsandbox.com/default"  }
+    response = megams.post_sshkey(tmp_hash)
+    assert_equal(201, response.status)
+  end
+
+=begin
+  def test_get_sshkeys
+    response = megams.get_sshkeys
+    assert_equal(200, response.status)
+  end
+=end
+=begin
+  def test_get_sshkey2
+    response = megams.get_sshkey("rkspce_sundown_play")
+    assert_equal(200, response.status)
+  end
+=end  
+=begin
+  def test_get_sshkey1
+    response = megams.get_sshkey("iaas_default")
+    assert_equal(200, response.status)
+  end
+
+def test_get_sshkey_not_found
+assert_raises(Megam::API::Errors::NotFound) do
+megams.get_sshkey("stupid.megam.co")
+end
+end
+=end
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: megam_api
 version: !ruby/object:Gem::Version
-  version: 0.7.9
+  version: 0.8.0
 platform: ruby
 authors:
 - Kishorekumar Neelamegam, Thomas Alrin, Subash Sethurajan, Rajthilak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-17 00:00:00.000000000 Z
+date: 2014-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -142,6 +142,7 @@ files:
 - lib/megam/api/predef_clouds.rb
 - lib/megam/api/predefs.rb
 - lib/megam/api/requests.rb
+- lib/megam/api/sshkeys.rb
 - lib/megam/api/version.rb
 - lib/megam/builder/delete_node.rb
 - lib/megam/builder/make_node.rb
@@ -178,6 +179,8 @@ files:
 - lib/megam/core/request.rb
 - lib/megam/core/request_collection.rb
 - lib/megam/core/server_api.rb
+- lib/megam/core/sshkey.rb
+- lib/megam/core/sshkey_collection.rb
 - lib/megam/core/stuff.rb
 - lib/megam/core/text.rb
 - lib/megam/core/text_formatter.rb
@@ -197,6 +200,7 @@ files:
 - test/test_predefclouds.rb
 - test/test_predefs.rb
 - test/test_requests.rb
+- test/test_sshkeys.rb
 homepage: http://github.com/indykish/megam_api
 licenses:
 - Apache V2