RubyGems - megam_api - Versions diffs - 0.95 → 0.96 - Mend

megam_api 0.95 → 0.96

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (8) hide show

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e8a0f42ca3b125e4c15c17b28b6678fe2283f93
-  data.tar.gz: fa7609f6ac9427fd2ffe8d117237ebb53fc9671d
+  metadata.gz: bf28e37d2d592a57c4ebefeb2a2bccc316da5089
+  data.tar.gz: 8ddc56a28e21d535fe1140d76755a876e1c11959
 SHA512:
-  metadata.gz: ce7978f9c336ae585c443cd7edc00085a55425727192d9844d2e785ab0992f07efdb6a107903a47c4b433fa3fb42c1d944b0e0f6a0f3154f9e6c461bf89d9a0a
-  data.tar.gz: 9401e01eef3c64befc83a9a14a4285361870c2afa0c9964b9afafc154be6e24b5005d2e6ca3909a62b047944a609cbad98b9714918d58d40dc6fdea5432fd92c
+  metadata.gz: ffb1be4ce1f8e5463e04f13bf67f5894eb05aa2590585c8a46e65cb1ad4e649febaeeb2a2c78eea66e41b28ed390dfc1eb209d78c63543e9ab23cc00574a8964
+  data.tar.gz: ac923ced56d8882276ab74d70b2c71c96b15502548ee2710a3f7d4f8f2cf1edb93550d4b1f4be159d2ae2f79efd49706bf966f6ba00c9c64860d058507117a3f

data/lib/megam/api/version.rb CHANGED Viewed

@@ -15,6 +15,6 @@
 #
 module Megam
   class API
-    VERSION = "0.95"
+    VERSION = "0.96"
   end
 end

data/lib/megam/core/domains.rb CHANGED Viewed

@@ -17,6 +17,7 @@ module Megam
   class Domains < Megam::ServerAPI
     def initialize(o)
       @id = nil
+      @org_id = nil
       @name = nil
       @created_at = nil
       super(o)
@@ -33,6 +34,15 @@ module Megam
         @id
       end
     end
+    def org_id(arg=nil)
+      if arg != nil
+        @org_id = arg
+      else
+        @org_id
+      end
+    end
     def name(arg=nil)
       if arg != nil
@@ -54,6 +64,7 @@ module Megam
       index_hash = Hash.new
       index_hash["json_claz"] = self.class.name
       index_hash["id"] = id
+      index_hash["org_id"] = org_id
       index_hash["name"] = name
       index_hash["created_at"] = created_at
       index_hash
@@ -66,6 +77,7 @@ module Megam
     def for_json
       result = {
         "id" => id,
+        "org_id" => org_id,
         "name" => name,
         "created_at" => created_at
       }
@@ -74,8 +86,9 @@ module Megam
     # Create a Megam::Domains from JSON (used by the backgroud job workers)
     def self.json_create(o)
-      dmn = new
+      dmn = new({})
       dmn.id(o["id"]) if o.has_key?("id")
+      dmn.org_id(o["org_id"]) if o.has_key?("org_id")
       dmn.name(o["name"]) if o.has_key?("name")
       dmn.created_at(o["created_at"]) if o.has_key?("created_at")
       dmn
@@ -90,6 +103,7 @@ module Megam
     def from_hash(o)
       @id        = o[:id] if o.has_key?(:id)
+      @org_id        = o[:org_id] if o.has_key?(:org_id)
       @name     = o[:name] if o.has_key?(:name)
       @created_at = o[:created_at] if o.has_key?(:created_at)
       self

data/lib/megam/core/sshkey.rb CHANGED Viewed

@@ -66,7 +66,7 @@ module Megam
       if arg != nil
         @publickey = arg
       else
-      @publikey
+      @publickey
       end
     end

data/test/test_accounts.rb CHANGED Viewed

@@ -1,49 +1,29 @@
 require File.expand_path("#{File.dirname(__FILE__)}/test_helper")
 class TestAccounts < MiniTest::Unit::TestCase
-  $admin = "admin-tom"
-  $normal = "normal-tom"
-  $tom_email = "tom@gomegam.com"
-  $bob_email = "bob@gomegam.com"
-#=begin
-def test_signin_auth
-    response =megams.get_accounts("test@megam.io")
-    response.body.to_s
-    assert_equal(200, response.status)
-end
-  def test_get_accounts_good
-    response =megams.get_accounts(sandbox_email)
+  def test_signin_auth
+    response = megams.get_accounts("test@megam.io")
     response.body.to_s
     assert_equal(200, response.status)
   end
-#=begin
   def test_post_accounts_good
     tmp_hash = {
-      "id" => "000099090909000",
       "first_name" => "Darth",
       "last_name" => "Vader",
-      "email" => "coolvader@iamswag.com",
+      "email" => "test@megam.io",
       "phone" => "19090909090",
       "api_key" => "IamAtlas{74}NobdyCanSedfefdeME#07",
       "authority" => "admin",
-      "password" => "",
+      "password" => Base64.strict_encode64("megam"),
       "password_reset_key" => "",
       "password_reset_sent_at" => "",
-      "created_at" => "2014-10-29 13:24:06 +0000"
-      }
-    response =megams.post_accounts(tmp_hash)
+    }
+    response =megams_new.post_accounts(tmp_hash)
     response.body.to_s
     assert_equal(201, response.status)
   end
-#=end
-=begin
   def test_update_accounts_good
     tmp_hash = {
       "id" => "w3423",
@@ -52,45 +32,21 @@ end
       "email" => "super@test.com",
       "phone" => "19090909090011111111",
       "api_key" => "IamAtlas{74}NobdyCanSedfefdeME#07",
-      "authority" => "admin",
       "password" => "tset",
+      "authority" => "admin",
       "password_reset_key" => "",
-      "password_reset_sent_at" => "",
       "created_at" => "2014-10-29 13:24:06 +0000"
-      }
-   response = megams.update_accounts(tmp_hash)
-   response.body.to_s
-   assert_equal(201, response.status)
- end
-=end
-=begin
-  def test_get_accounts_bad
-    assert_raises(Megam::API::Errors::NotFound) do
-    response =megams.get_accounts(sandbox_email+"_bad")
-    response.body.to_s
-    end
-  end
-  def test_post_accounts_admin
-    response =megams.post_accounts(
-    {:id => random_id, :email => $tom_email, :api_key => sandbox_apikey, :authority => $admin})
-    response.body.to_s
-    assert_equal(201, response.status)
-  end
-  def test_post_accounts_normal
-    response =megams.post_accounts(
-    {:id => random_id, :email => $bob_email, :api_key => sandbox_apikey, :authority => $normal})
+    }
+    response = megams.update_accounts(tmp_hash)
     response.body.to_s
     assert_equal(201, response.status)
   end
-  def test_post_accounts_normal_bad
-    assert_raises(ArgumentError) do
-    response =megam.post_accounts(
-    {:id => random_id, :emailo => sandbox_email,
-      :apik_key => sandbox_apikey, :authority => $admin})
-    response.body.to_s
+  def test_get_accounts_bad
+    assert_raises(Megam::API::Errors::NotFound) do
+      response =megams.get_accounts(sandbox_email+"_bad")
+      response.body.to_s
     end
   end
-=end
-end
+end

data/test/test_assemblies.rb CHANGED Viewed

@@ -1,78 +1,39 @@
 require File.expand_path("#{File.dirname(__FILE__)}/test_helper")
 class TestApps < MiniTest::Unit::TestCase
-#=begin
+  #=begin
   def test_get_assemblies
-   response = megams.get_assemblies
-   assert_equal(200, response.status)
- end
-#=end
-#=begin
- def test_get_assembly
-   response = megams.get_one_assemblies("AMS8231283327211460972")
-   assert_equal(200, response.status)
- end
-#=end
+    response = megams.get_assemblies
+    assert_equal(200, response.status)
+  end
+  #=end
-#=begin
- def test_post_assembly
-   tmp_hash =  {
-     "name"=>"",
-     "org_id"=>"ORG123",
-     "assemblies"=>[{
-       "name"=>"covey",
-       "tosca_type"=>"tosca.app.java",
-       "inputs"=>[
-         {"key"=>"domain","value"=>"megambox.com"},
-         {"key"=>"sshkey","value"=>"a@b.com_rtr"},
-         {"key"=>"provider","value"=>"one"},
-         {"key"=>"cpu","value"=>"0.5"},
-         {"key"=>"ram","value"=>"896"},
-         {"key"=>"version","value"=>"8.x"},
-         {"key"=>"lastsuccessstatusupdate","value"=>"02 Feb 16 13:20 IST"},
-         {"key"=>"status","value"=>"error"}
-         ],
-       "outputs"=>[],
-       "policies"=>[],
-       "status"=>"error",
-       "created_at"=>"2016-02-02 07:50:49 +0000",
-       "components"=>[
-         {
-           "name"=>"sheba",
-           "tosca_type"=>"tosca.app.java",
-           "inputs"=>[
-             {"key"=>"domain","value"=>"megambox.com"},
-             {"key"=>"sshkey","value"=>"a@b.com_rtr"},
-             {"key"=>"provider","value"=>"one"},
-             {"key"=>"cpu","value"=>"0.5"},
-             {"key"=>"ram","value"=>"896"},
-             {"key"=>"version","value"=>"8.x"},
-             {"key"=>"lastsuccessstatusupdate","value"=>"02 Feb 16 13:20 IST"},
-             {"key"=>"status","value"=>"error"}
-             ],
-           "outputs"=>[],
-           "envs"=>[
-             {"key"=>"port","value"=>"8080"},
-             {"key"=>"tomcat_username","value"=>"megam"},
-             {"key"=>"tomcat_password","value"=>"megam"}
-             ],
-           "repo"=>{
-             "rtype"=>"source",
-             "source"=>"github",
-             "oneclick"=>"","url"=>"https://github.com/rajthilakmca/java-spring-petclinic.git"
-             },
-            "artifacts"=>{"artifact_type"=>"","content"=>"","requirements"=>[]},
-            "related_components"=>[],
-            "operations"=>[{
-              "operation_type"=>"CI",
-              "description"=>"always up to date code. sweet.",
-              "properties"=>[
-                {"key"=>"type","value"=>"github"},
-                {"key"=>"token","value"=>"066b697558f048459412410483ca8965415bf7de"},
-                {"key"=>"username","value"=>"rajthilakmca"}],
-              "status"=>"notbound"}],
-              "status"=>"error"}]}],
+  #=begin
+  def test_post_assembly
+    tmp_hash =  {
+      "name"=>"",
+      "org_id"=>"ORG123",
+      "assemblies"=>[{
+          "name"=>"covey",
+          "tosca_type"=>"tosca.app.java",
+          "inputs"=>[
+            {"key"=>"domain","value"=>"megambox.com"},
+            {"key"=>"sshkey","value"=>"a@b.com_rtr"},
+            {"key"=>"provider","value"=>"one"},
+            {"key"=>"cpu","value"=>"0.5"},
+            {"key"=>"ram","value"=>"896"},
+            {"key"=>"version","value"=>"8.x"},
+            {"key"=>"lastsuccessstatusupdate","value"=>"02 Feb 16 13:20 IST"},
+            {"key"=>"status","value"=>"error"}
+          ],
+          "outputs"=>[],
+          "policies"=>[],
+          "status"=>"error",
+          "created_at"=>"2016-02-02 07:50:49 +0000",
+          "components"=>[
+            {
+              "name"=>"sheba",
+              "tosca_type"=>"tosca.app.java",
               "inputs"=>[
                 {"key"=>"domain","value"=>"megambox.com"},
                 {"key"=>"sshkey","value"=>"a@b.com_rtr"},
@@ -81,11 +42,43 @@ class TestApps < MiniTest::Unit::TestCase
                 {"key"=>"ram","value"=>"896"},
                 {"key"=>"version","value"=>"8.x"},
                 {"key"=>"lastsuccessstatusupdate","value"=>"02 Feb 16 13:20 IST"},
-                {"key"=>"status","value"=>"error"}]
-                }
+                {"key"=>"status","value"=>"error"}
+              ],
+              "outputs"=>[],
+              "envs"=>[
+                {"key"=>"port","value"=>"8080"},
+                {"key"=>"tomcat_username","value"=>"megam"},
+                {"key"=>"tomcat_password","value"=>"megam"}
+              ],
+              "repo"=>{
+                "rtype"=>"source",
+                "source"=>"github",
+                "oneclick"=>"","url"=>"https://github.com/rajthilakmca/java-spring-petclinic.git"
+              },
+              "artifacts"=>{"artifact_type"=>"","content"=>"","requirements"=>[]},
+              "related_components"=>[],
+              "operations"=>[{
+                  "operation_type"=>"CI",
+                  "description"=>"always up to date code. sweet.",
+                  "properties"=>[
+                    {"key"=>"type","value"=>"github"},
+                    {"key"=>"token","value"=>"066b697558f048459412410483ca8965415bf7de"},
+                    {"key"=>"username","value"=>"rajthilakmca"}],
+                  "status"=>"notbound"}],
+              "status"=>"error"}]}],
+      "inputs"=>[
+        {"key"=>"domain","value"=>"megambox.com"},
+        {"key"=>"sshkey","value"=>"a@b.com_rtr"},
+        {"key"=>"provider","value"=>"one"},
+        {"key"=>"cpu","value"=>"0.5"},
+        {"key"=>"ram","value"=>"896"},
+        {"key"=>"version","value"=>"8.x"},
+        {"key"=>"lastsuccessstatusupdate","value"=>"02 Feb 16 13:20 IST"},
+        {"key"=>"status","value"=>"error"}]
+    }
-   response = megams.post_assemblies(tmp_hash)
-   assert_equal(200, response.status)
-end
+    response = megams.post_assemblies(tmp_hash)
+    assert_equal(200, response.status)
+  end
 #=end
 end

data/test/test_sshkeys.rb CHANGED Viewed

@@ -3,7 +3,6 @@ require File.expand_path("#{File.dirname(__FILE__)}/test_helper")
 class TestApps < MiniTest::Unit::TestCase
 #=begin
   def test_post_sshkey2
     tmp_hash = {
       :name => "test_sample",
@@ -43,27 +42,9 @@ txyXl+iiF1+Nco4t/Jj3VvgzoIa25oQp2aeQhY7oot04UyyOYkPkkRQ=
 #=end
 #=begin
   def test_get_sshkeys
     response = megams.get_sshkeys
     assert_equal(200, response.status)
   end
 #=end
-=begin
-#=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 CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: megam_api
 version: !ruby/object:Gem::Version
-  version: '0.95'
+  version: '0.96'
 platform: ruby
 authors:
 - Rajthilak, Kishorekumar Neelamegam, Thomas Alrin, Yeshwanth Kumar, Subash Sethurajan,