megam_api 0.89 → 0.90

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eda09d87237a4e68b0e218e8aecfe33a4d9b6960
-  data.tar.gz: e1c37240c06a6dad17476fd8c3cf31ad3c9dc94b
+  metadata.gz: 2bc860601d6f110c60235eb167e5a74df74fca9d
+  data.tar.gz: ff49084b1935212cc832f82dfd803d0dd2fbb3b0
 SHA512:
-  metadata.gz: 74dc014521891e56bbc8698b7776131b013b6f961acc1817a1706f8330b7c33227ac11cf61e7cc785d22c86ad00604d571a3df3339c93ad3041aa6f4d623ece4
-  data.tar.gz: 43d90ac5037918ef415c55d911b8a48512e923299ae4b93268bf77e05c5b07b07e0d08636e7bcfa365bb31e69c49a1f2a1c1856d94ceaab9137f44c45579a5c4
+  metadata.gz: d6432b20efbd64287f86cb506f37126507de50b722b3bcd9573f84fc5568941b32ca9544aeacfff310efad75cba627ca27ab31a47083b99d29ea21518c40879f
+  data.tar.gz: 50ff9a3a5c480e9b5a414d7725a90ea543f875f7bb734a7b5b05b926c5d170b10320a86cc2d2f963d4d06125543e89d0dacacce27f5db205425e8ddd87504892

data/lib/megam/api/version.rb

@@ -1,5 +1,5 @@
 module Megam
   class API
-    VERSION = "0.89"
+    VERSION = "0.90"
   end
 end

data/lib/megam/mixins/common_deployable.rb

@@ -38,7 +38,7 @@ module Megam
       def bld_toscatype(params)
         tosca_suffix = DEFAULT_TOSCA_SUFFIX
         tosca_suffix = "#{params[:mkp_name]}" unless params[:cattype] != 'TORPEDO'.freeze
-        @tosca_type = DEFAULT_TOSCA_PREFIX + ".#{params[:cattype].downcase}.#{params[:mkp_name].downcase}"
+        @tosca_type = DEFAULT_TOSCA_PREFIX + ".#{params[:cattype].downcase}.#{params[:mkp_name].downcase}" if params[:cattype] != nil  && params[:mkp_name] != nil
       end
     end
 

data/lib/megam/mixins/components.rb

@@ -8,7 +8,7 @@ module Megam
       attr_reader :mixins, :name, :repo, :related_components, :operations, :artifacts, :envs, :outputs
       def initialize(params)
         @mixins = CommonDeployable.new(params)
-        @name = params[:componentname]
+        @name = params[:componentname] if params[:componentname]
         @outputs = Outputs.new(params)
         @operations = add_operations(params)
         @related_components = add_related_components(params)
@@ -41,12 +41,12 @@ module Megam
 
       def add_related_components(params)
         related_components = []
-        related_components << "#{params[:assemblyname]}.#{params[:domain]}/#{params[:componentname]}" if params.key?(:bind_type)
+        related_components << "#{params[:bind_type]}" if params.key?(:bind_type)
       end
 
       def add_operations(params)
         operations = []
-        operations.push(create_operation(Operations::CI, Operations::CI_DESCRIPTON, params)) unless params[:scm_name] && params[:scm_name].strip.empty?
+        operations.push(create_operation(Operations::CI, Operations::CI_DESCRIPTON, params)) if params[:scm_name] && params[:scm_name].strip.empty?
         operations.push(create_operation(Operations::BIND, Operations::BIND_DESCRIPTON, params)) if params.key?(:bind_type)
       end
 

data/test/mixins/test_assemblies.rb

@@ -4,6 +4,7 @@ gem 'minitest' # ensure we are using the gem version
 require 'minitest/autorun'
 
 require File.expand_path("#{File.dirname(__FILE__)}/../../lib/megam/mixins/assemblies")
+require File.expand_path("#{File.dirname(__FILE__)}/../../lib/megam/mixins/components")
 class TestMixinsAssemblies < MiniTest::Unit::TestCase
 
 #=begin
@@ -12,8 +13,8 @@ class TestMixinsAssemblies < MiniTest::Unit::TestCase
     tmp_hash = {"utf8"=>"✓", "mkp_name" => "ubuntu", "cattype":"TORPEDO", "version":"14.04", "assemblyname"=>"biblical", "domain"=>"megambox.com", "ram"=>"896", "cpu"=>"0.5", "SSH_USEOLD_name"=>"tom", "SSH_NEW_name"=>"", "sshoption"=>"SSH_USEOLD", "provider"=>"one", "componentname"=>"ovid", "commit"=>" Create ", "controller"=>"marketplaces", "action"=>"create", "email"=>"8@8.com", "api_key"=>"-NQi-aSKHcmKntCsXb03jw==", "host"=>"192.168.1.105", "org_id"=>"ORG1270367691894554624", "ssh_keypair_name"=>"tom", "name"=>"tom", "path"=>"8@8.com_tom"}
 
     envs_hash = {"utf8"=>"✓", "authenticity_token"=>"EXNN8YBO01ebNv8RSbc3psdo+soP5Cxee8UXdi0qEdm78hkwKVIBaPzPh0IQBXcNtL6efvSkCbMkT1nca80zkA==", "version"=>"1.5.0", "mkp_name"=>"HotelManangement", "cattype"=>"ANALYTICS", "envs"=>[{"key":"spark_master","value":"<spark_master>"},{"key":"oja_assembly_id","value":"<oja_assembly_id>"},{"key":"file2","value":"<file2>"},{"key":"oja_email","value":"<oja_email>"},{"key":"oja_component_id","value":"<oja_component_id>"},{"key":"file1","value":"<file1>"},{"key":"oja_apikey","value":"<oja_apikey>"}], "assemblyname"=>"sweet", "domain"=>"megambox.com", "ram"=>"896", "cpu"=>"0.5", "SSH_USEOLD_name"=>"megam_sss", "SSH_NEW_name"=>"", "sshoption"=>"SSH_USEOLD", "provider"=>"one", "componentname"=>"minute", "commit"=>" Create "}
-#{"utf8"=>"✓", "version"=>"14.04", "mkp_name"=>"ubuntu", "cattype"=>"TORPEDO", "assemblyname"=>"implanting", "domain"=>"megambox.com", "ram"=>"896", "cpu"=>"0.5", "SSH_USEOLD_name"=>"tom", "SSH_NEW_name"=>"", "sshoption"=>"SSH_USEOLD", "provider"=>"one", "componentname"=>"sad", "commit"=>" Create "}
 
+#{"utf8"=>"✓", "version"=>"14.04", "mkp_name"=>"ubuntu", "cattype"=>"TORPEDO", "assemblyname"=>"implanting", "domain"=>"megambox.com", "ram"=>"896", "cpu"=>"0.5", "SSH_USEOLD_name"=>"tom", "SSH_NEW_name"=>"", "sshoption"=>"SSH_USEOLD", "provider"=>"one", "componentname"=>"sad", "commit"=>" Create "}
 
 #assemblies: [{"status"=>"launching", "tosca_type"=>"tosca.torpedo.ubuntu", "inputs"=>[{"key"=>"domain", "value"=>"megambox.com"}, {"key"=>"provider", "value"=>"one"}, {"key"=>"cpu", "value"=>"0.5"}, {"key"=>"ram", "value"=>"896"}, {"key"=>"version", "value"=>"14.04"}], "name"=>"implanting", "components"=>[], "outputs"=>[], "policies"=>[]}]
 

metadata

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