megam_api 0.78 → 0.79

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51eceb4ec1ff92180ac4592a24064baa2547fdad
-  data.tar.gz: 7dec9a0156625550f4701034794eae62347ccb7f
+  metadata.gz: 265578c80c963c09316bd9815e2e19c3e3973956
+  data.tar.gz: 86c8ba17bb8654c7b970a367240a6554845a58b5
 SHA512:
-  metadata.gz: 5740d0d62c5c306999b2ee28c4081e2186e9a96d8fb494ebcb815227b3db9777f895eb202af7e457db6d103c5957408bf8eae19b083eedad7560dd4023e0902d
-  data.tar.gz: e8cb2cecfce4bd4bab33a52aefe6647c6e0f07c7011d4bb00d852633c50f0a795193ca30b8a4b602a5fe5b17117da30de6fc0d8a7a5bfc90d23a2da29c47b0ab
+  metadata.gz: db751289790035ab255e2052c491ee09c19c4889f1ac180c6f5de499e52a8f92339726d353c17bdbe61119f28540d5828a84800d1bb05b7d321e50da440cf436
+  data.tar.gz: 33c749e14be9ed9820969076fbb2f07a0db4142cb64608107accc1cc63623199d994600371b9424148f662fcec774a0e3168abfe61e47806a33f9781e087f1ae

data/lib/megam/api.rb

@@ -35,6 +35,14 @@ require 'megam/api/subscriptions'
 require 'megam/api/promos'
 require 'megam/api/invoices'
 
+require 'megam/mixins/assemblies'
+require 'megam/mixins/assembly'
+require 'megam/mixins/common_deployable'
+require 'megam/mixins/components'
+require 'megam/mixins/megam_attributes'
+require 'megam/mixins/outputs'
+require 'megam/mixins/policies'
+
 require 'megam/core/server_api'
 require 'megam/core/config'
 require 'megam/core/stuff'

data/lib/megam/api/version.rb

@@ -1,5 +1,5 @@
 module Megam
   class API
-    VERSION = "0.78"
+    VERSION = "0.79"
   end
 end

data/lib/megam/core/components.rb

@@ -22,6 +22,7 @@ module Megam
       @tosca_type = nil
       @inputs = []
       @outputs = []
+      @envs = []
       @artifacts = {}
       @artifact_type = nil
       @content = nil
@@ -83,6 +84,14 @@ module Megam
       end
     end
 
+    def envs(arg = [])
+      if arg != []
+        @envs = arg
+      else
+        @envs
+   end
+ end
+
     def artifacts(arg = nil)
       if !arg.nil?
         @artifacts = arg
@@ -200,6 +209,7 @@ module Megam
       index_hash['tosca_type'] = tosca_type
       index_hash['inputs'] = inputs
       index_hash['outputs'] = outputs
+      index_hash['envs'] = envs
       index_hash['artifacts'] = artifacts
       index_hash['related_components'] = related_components
       index_hash['operations'] = operations
@@ -222,6 +232,7 @@ module Megam
         'tosca_type' => tosca_type,
         'inputs' => inputs,
         'outputs' => outputs,
+        'envs' => envs,
         'artifacts' => artifacts,
         'related_components' => related_components,
         'operations' => operations,
@@ -239,7 +250,7 @@ module Megam
       asm.tosca_type(o['tosca_type']) if o.key?('tosca_type')
       asm.inputs(o['inputs']) if o.key?('inputs')
       asm.outputs(o['outputs']) if o.key?('outputs')
-
+      asm.envs(o['envs']) if o.key?('envs')
       ar = o['artifacts']
       asm.artifacts[:artifact_type] = ar['artifact_type'] if ar && ar.key?('artifact_type')
       asm.artifacts[:content] = ar['content'] if ar && ar.key?('content')
@@ -270,6 +281,7 @@ module Megam
       @tosca_type                      = o['tosca_type'] if o.key?('tosca_type')
       @inputs                          = o['inputs'] if o.key?('inputs')
       @outputs                         = o['outputs'] if o.key?('outputs')
+      @envs                            = o['envs'] if o.key?('envs')
       @artifacts                       = o['artifacts'] if o.key?('artifacts')
       @related_components              = o['related_components'] if o.key?('related_components')
       @operations                      = o['operations'] if o.key?('operations')

data/lib/megam/mixins/assemblies.rb

@@ -1,16 +1,16 @@
-require File.expand_path("#{File.dirname(__FILE__)}/common_deployable")
+require File.expand_path("#{File.dirname(__FILE__)}/assembly")
 
 module Megam
   class Mixins
     class Assemblies
-      attr_reader :assemblys
+      attr_reader :assembly
 
       def initialize(params)
-        @assemblys = CommonDeployable.new(params)
+        @assembly = Assembly.new(params)
       end
 
-      def to_hash
-        {:assemblys => assemblys.to_hash}
+       def to_hash
+        assembly.to_hash
       end
     end
   end

data/lib/megam/mixins/{assemblys.rb → assembly.rb}

@@ -4,7 +4,7 @@ require File.expand_path("#{File.dirname(__FILE__)}/outputs")
 
 module Megam
   class  Mixins
-    class Assemblys
+    class Assembly
       attr_reader :components, :policies, :outputs, :mixins
 
       def initialize(params)
@@ -20,7 +20,7 @@ module Megam
         result[:components]  = @components if @components
         result[:outputs] = @outputs.to_array  if @outputs
         result[:policies] = @policies if @policies
-        [result]
+        result
       end
 
       private

data/test/mixins/test_assemblies.rb

@@ -3,15 +3,15 @@
 gem 'minitest' # ensure we are using the gem version
 require 'minitest/autorun'
 
-require File.expand_path("#{File.dirname(__FILE__)}/../../lib/megam/mixins/assemblys")
+require File.expand_path("#{File.dirname(__FILE__)}/../../lib/megam/mixins/assemblies")
 class TestMixinsAssemblies < MiniTest::Unit::TestCase
 
   def test_torpedo
     ## input the torpedo hash
-    tmp_hash = {"utf8"=>"✓", "version"=>"14.04","mkp_name" => "ubuntu", "cattype":"TORPEDO", "mkp_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"}
-assembly_hash = Megam::Mixins::Assemblys.new(tmp_hash).to_hash
+    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"}
+assembly_array = Megam::Mixins::Assemblies.new(tmp_hash).to_array
 puts "=========================================> END <==============================================="
-puts assembly_hash.inspect
+puts assembly_array.inspect
 
     #response = megams.post_billings(tmp_hash)
     #assert_equal(201, response.status)

data/test/test_assemblies.rb

@@ -29,11 +29,15 @@ class TestApps < MiniTest::Unit::TestCase
         "status" => "",
         "related_components" => ["VernonDennis.megam.co"],
         "outputs" => [],
-        "artifacts" => [{
+        "envs" => [{
+            "key" => "REDIS_HOST",
+            "value" => "tempp.megambox.com"
+        }],
+        "artifacts" => {
         "artifact_type" => "tosca_type",
         "content" => "",
         "artifact_requirements" => []
-        }],
+        },
         "operations" => [{
           "operation_type" => "CI",
           "description" => "continuous Integration",

data/test/test_assembly.rb

@@ -4,7 +4,7 @@ class TestApps < MiniTest::Unit::TestCase
 =begin
   def test_post_assembly
     tmp_hash = { "name" => "calcines",
-      "components" => ["COM1139235178934304768",""],
+      "components" => ["COM1270769168056188928",""],
       "tosca_type" => "",
     "policies" => [{
         "name" => "bind policy",
@@ -24,7 +24,7 @@ class TestApps < MiniTest::Unit::TestCase
 =end
 #=begin
   def test_get_assembly
-    response = megams.get_one_assembly("ASM1265658284040388608")
+    response = megams.get_one_assembly("ASY1271842787775610880")
     assert_equal(200, response.status)
   end
 #=end

data/test/test_components.rb

@@ -1,25 +1,36 @@
 require File.expand_path("#{File.dirname(__FILE__)}/test_helper")
 
 class TestApps < MiniTest::Unit::TestCase
+#=begin
   def test_get_component
-    response = megams.get_components("COM1265658284082331648")
+    response = megams.get_components("COM1271871641852444672")
     assert_equal(200, response.status)
   end
+#=end
 =begin
   def test_update_component
     tmp_hash = {
-      "id" => "COM1139245887592202240",
+      "id" => "COM1271850006541893632",
       "name" => "NettieMoore",
       "tosca_type" => "tosca.web.redis",
       "inputs" => [],
       "outputs" => [],
+      "envs" => [
+      {
+           "key" => "REDIS_HOST",
+           "value" => "tempp.megambox.com"
+       },
+    ],
       "artifacts" => {
         "artifact_type" => "tosca type",
         "content" => "",
         "artifact_requirements" => []
       },
-      "related_components" => "AntonioMcCormick.megam.co/TimothyHenderson",
+      "related_components" => ["AntonioMcCormick.megam.co/TimothyHenderson"],
       "operations" => [],
+      "repo" => {
+        "rtype" => "image", "source" => "github", "oneclick" => "yes", "url" => "imagename"},
+
       "status" => "",
       "created_at" => "2014-10-29 14:06:39 +0000"
     }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: megam_api
 version: !ruby/object:Gem::Version
-  version: '0.78'
+  version: '0.79'
 platform: ruby
 authors:
 - Rajthilak, Kishorekumar Neelamegam, Thomas Alrin, Yeshwanth Kumar, Subash Sethurajan,
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-29 00:00:00.000000000 Z
+date: 2015-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -208,7 +208,7 @@ files:
 - lib/megam/core/text.rb
 - lib/megam/core/text_formatter.rb
 - lib/megam/mixins/assemblies.rb
-- lib/megam/mixins/assemblys.rb
+- lib/megam/mixins/assembly.rb
 - lib/megam/mixins/common_deployable.rb
 - lib/megam/mixins/components.rb
 - lib/megam/mixins/megam_attributes.rb