megam_api 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18c65c1b5bad20bae3824e93dc24c97a5e78af5b
-  data.tar.gz: 549d74e7aa3e9c1319c55183409a84ce9417cd87
+  metadata.gz: 292c7d8dc01674d2ca77d7d05510a62b8d29b9ff
+  data.tar.gz: 99b20c558c8f1b6535de71f8fbb75bde0a490906
 SHA512:
-  metadata.gz: aa1e94ce4b19cad03b9aa4d32caea27ab1607bb71ae3a6ab9b8bc57c170af6761bef0699ae5585e7c2e3c7aef8eb17d5b5d06db0d4caaa53992c906903b9fa3d
-  data.tar.gz: 9a7596daa4428473102a9ee50a1c3b8f25ad1dad16085f662cdb00774cbb5fc13e7b85da1bfd25f6d7761d51e1719d565699e359763461e2b37e2f1f1295cdc9
+  metadata.gz: d3dcf1946b7f04c8f0d1af7733f767619a234bb15f204ef1b2b2e764b8f8202d4041e1f69ee444394405f6621ff5c3952ab1c49f3d44e92541c3fbfa4e379b62
+  data.tar.gz: 201cb14e57a6da29c4a08a5a9ec40556f3e46a040c8d5c4cb2e9b6dda445e1a4c87128d454addad6a06fd0900be1486fb05deb824388ca40b9519bb7d87aefb1

data/lib/megam/api/version.rb

@@ -1,5 +1,5 @@
 module Megam
   class API
-    VERSION = "0.7.2"
+    VERSION = "0.7.3"
   end
 end

data/lib/megam/builder/delete_node.rb

@@ -47,8 +47,7 @@ module Megam
       cloud_instruction = template.lookup_by_instruction(group, action)
       ci_command = "#{cloud_instruction.command}"
       ci_command["<node_name>"] = "#{node_name}"
-
-      command_hash = {
+         command_hash = {
         "systemprovider" => {
           "provider" => {
             "prov" => "#{node.request[:command]['systemprovider']['provider']['prov']}"

data/lib/megam/builder/make_node.rb

@@ -27,7 +27,6 @@ module Megam
         pc_collection = make_command.megam_rest.get_predefclouds
         ct_collection = make_command.megam_rest.get_cloudtools
         cts_collection = make_command.megam_rest.get_cloudtoolsettings
-
       rescue ArgumentError => ae
         hash = {"msg" => ae.message, "msg_type" => "error"}
         re = Megam::Error.from_hash(hash)
@@ -41,16 +40,24 @@ module Megam
         re = Megam::Error.from_hash(hash)
       return re
       end
-      
-predef_cloud = pc_collection.data[:body].lookup("#{data[:predef_cloud_name]}")
-tool = ct_collection.data[:body].lookup(data[:provider])
-template = tool.cloudtemplates.lookup(predef_cloud.spec[:type_name])
-cloud_instruction = template.lookup_by_instruction(group, action)
-cts = cts_collection.data[:body].lookup(data[:repo])
-ci_command = "#{cloud_instruction.command}"
-ci_command["-c"] = "-c #{cts.conf_location}"
-ci_name = cloud_instruction.name
-
+      predef_cloud = pc_collection.data[:body].lookup("#{data[:predef_cloud_name]}")
+      tool = ct_collection.data[:body].lookup(data[:provider])
+      template = tool.cloudtemplates.lookup(predef_cloud.spec[:type_name])
+      cloud_instruction = template.lookup_by_instruction(group, action)
+      cts = cts_collection.data[:body].lookup(data[:repo])
+      ci_command = "#{cloud_instruction.command}"
+      if ci_command["<node_name>"].present?
+        ci_command["<node_name>"] = "#{data[:book_name]}"
+      end
+      u = URI.parse(predef_cloud.access[:vault_location])
+      u.path[0]=""
+      if ci_command["-f"].present?
+        ci_command["-f"] = "-f " + u.path + "/" + predef_cloud.spec[:type_name] + ".json"
+      end
+      if ci_command["-c"].present?
+        ci_command["-c"] = "-c #{cts.conf_location}"
+      end
+      ci_name = cloud_instruction.name
       command_hash = {
         "systemprovider" => {
           "provider" => {
@@ -100,12 +107,26 @@ ci_name = cloud_instruction.name
       }
 
       if data[:book_type] == "APP"
+        if data[:deps_scm].length > 0
+          data[:runtime_exec] = change_runtime(data[:deps_scm], data[:runtime_exec], action)
+        end
+        if data[:deps_war].length > 0
+          data[:runtime_exec] = change_runtime(data[:deps_war], data[:runtime_exec], action)
+        end
         node_hash["appdefns"] = {"timetokill" => "#{data[:timetokill]}", "metered" => "#{data[:metered]}", "logging" => "#{data[:logging]}", "runtime_exec" => "#{data[:runtime_exec]}"}
       end
       if data[:book_type] == "BOLT"
         node_hash["boltdefns"] = {"username" => "#{data['user_name']}", "apikey" => "#{data['password']}", "store_name" => "#{data['store_db_name']}", "url" => "#{data['url']}", "prime" => "#{data['prime']}", "timetokill" => "#{data['timetokill']}", "metered" => "#{data['monitoring']}", "logging" => "#{data['logging']}", "runtime_exec" => "#{data['runtime_exec']}" }
-      end      
+      end
       node_hash
     end
+
+    def self.change_runtime(deps, runtime, action)      
+      project_name = File.basename(deps).split(".").first
+      if /<projectname>/.match(runtime)
+        runtime["unicorn_<projectname>"] = "unicorn_" + project_name
+      end            
+      runtime
+    end
   end
 end

data/lib/megam/core/appdefns.rb

@@ -167,13 +167,13 @@ module Megam
     end
 
     # Load a account by email_p
-    def self.show(node_name)
+    def self.show(id)
       appdefns = self.new()
-      appdefns.megam_rest.get_appdefn(node_name)
+      appdefns.megam_rest.get_appdefn(id)
     end
     
     # Load a account by email_p
-    def self.show(node_name, id)
+    def self.shown(node_name, id)
       appdefns = self.new()
       appdefns.megam_rest.get_appdefn(node_name,id)
     end

data/lib/megam/core/boltdefns.rb

@@ -204,7 +204,7 @@ end
     end
 
     # Show a bolt defn by [node_name, defn id] for an email
-    def self.show(node_name,id)
+    def self.shown(node_name,id)
       boltdefns = self.new()
       boltdefns.megam_rest.get_boltdefn(node_name,id)
     end

data/megam_api.gemspec

@@ -16,11 +16,11 @@ Gem::Specification.new do |s|
   s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-  s.add_runtime_dependency 'excon'
-  s.add_runtime_dependency 'highline'
-  s.add_runtime_dependency 'yajl-ruby'
-  s.add_runtime_dependency 'mixlib-config'
-  s.add_runtime_dependency 'mixlib-log'
-  s.add_development_dependency 'minitest'
-  s.add_development_dependency 'rake'
+  s.add_runtime_dependency 'excon', '~> 0'
+  s.add_runtime_dependency 'highline', '~> 0'
+  s.add_runtime_dependency 'yajl-ruby', '~> 0'
+  s.add_runtime_dependency 'mixlib-config', '~> 0'
+  s.add_runtime_dependency 'mixlib-log', '~> 0'
+  s.add_development_dependency 'minitest', '~> 0'
+  s.add_development_dependency 'rake', '~> 0'
 end

data/test/test_nodes.rb

@@ -45,8 +45,8 @@ class TestApps < MiniTest::Unit::TestCase
       "command" => @com,
       "predefs" => {"name" => "rails", "scm" => "",
         "db" => "postgres@postgresql1.megam.com/night.megam.co", "war" => "http://s3pub.com/0.1/granny.war", "queue" => "queue@queue1", "runtime_exec" => "sudo start rails"},
-      "appdefns" => {"timetokill" => "0", "metered" => "megam", "logging" => "megam", "runtime_exec" => "runtime_execTOM"},
-      "boltdefns" => {"username" => "tom", "apikey" => "123456", "store_name" => "tom_db", "url" => "", "prime" => "", "timetokill" => "", "metered" => "", "logging" => "", "runtime_exec" => ""},
+      "appdefns" => {"timetokill" => "0", "metered" => "megam", "logging" => "megam", "runtime_exec" => "start unicorn_<projectname>"},
+      "boltdefns" => {"username" => "", "apikey" => "", "store_name" => "", "url" => "", "prime" => "", "timetokill" => "", "metered" => "", "logging" => "", "runtime_exec" => ""},
       "appreq" => {},
       "boltreq" => {}
     }
@@ -54,7 +54,7 @@ class TestApps < MiniTest::Unit::TestCase
     response = megams.post_node(tmp_hash)
     assert_equal(201, response.status)
   end
-
+=begin
   def test_post_node2
     tmp_hash = {
       "node_name" => "sundown.megam.co",
@@ -132,4 +132,5 @@ class TestApps < MiniTest::Unit::TestCase
     response = megams.post_request(tmp_hash)
     assert_equal(201, response.status)
   end
+=end  
 end

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: megam_api
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Kishorekumar Neelamegam, Thomas Alrin, Subash Sethurajan, Rajthilak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-19 00:00:00.000000000 Z
+date: 2014-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mixlib-config
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mixlib-log
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 description: Ruby Client for the Megam Cloud. Performs REST based HTTP calls to api.megam.co
@@ -119,9 +119,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .project
-- .travis.yml
+- ".gitignore"
+- ".project"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -206,17 +206,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Ruby Client for the Megam Cloud