megam_api 0.22 → 0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3467375fa08dc63c609b5eed5d8bfb802909db30
-  data.tar.gz: 588347a1fed3837f843a64e091b5003046d9194a
+  metadata.gz: ed8e85c99104ae0dbc964b06fac754abeb9170e0
+  data.tar.gz: 898bb08d102dfd8b7c893d58fcf0333b3583d089
 SHA512:
-  metadata.gz: ac270c67423b416c1dd629ba5d935d9017ff5b1e4bc2874e62d36ced26a20e5af7fa426d0d0f73222f71e5537f561348e75871cadab2732dff69cc6a342a4f60
-  data.tar.gz: 641bfcb0720e77772b11732afa8d19711f3e662c1cdf5f584013cfe664c103e18ce1be2eb31f606877d7dcf0f630a56937930eaf4acc95604222a47f0e2b0b8d
+  metadata.gz: 2a6e66718f6d8eb1c8a0c9092d97d1c40224f504793db9284eb3db638670762df74d9c6a7c3522881a27340ef025011eaa6b158579db07d1241ef6d924519c22
+  data.tar.gz: be916ffcea604388b8fe46a7e367c7b723b73ccce0955d95f0ca3eec30dbfc62787f58595c7c5aac47453cfd5eea591005e4b5fcf2e46e9108ff8f15eeb4ab8e

data/lib/megam/api.rb

@@ -54,6 +54,7 @@ require "megam/core/marketplace_collection"
 require "megam/core/marketplace_addon"
 require "megam/core/marketplace_addon_collection"
 require "megam/core/organizations"
+require "megam/core/organizations_collection"
 require "megam/core/domains"
 require "megam/core/assemblies"
 require "megam/core/assemblies_collection"

data/lib/megam/api/version.rb

@@ -1,5 +1,5 @@
 module Megam
   class API
-    VERSION = "0.22"
+    VERSION = "0.23"
   end
 end

data/lib/megam/core/json_compat.rb

@@ -34,6 +34,7 @@ module Megam
     MEGAM_REQUEST                   = "Megam::Request".freeze
     MEGAM_REQUESTCOLLECTION         = "Megam::RequestCollection".freeze
     MEGAM_ORGANIZATION              = "Megam::Organizations".freeze
+    MEGAM_ORGANIZATIONSCOLLECTION    = "Megam::OrganizationsCollection".freeze
     MEGAM_DOMAIN                    = "Megam::Domains".freeze
     MEGAM_APPREQUEST                   = "Megam::AppRequest".freeze
     MEGAM_APPREQUESTCOLLECTION         = "Megam::AppRequestCollection".freeze
@@ -167,6 +168,8 @@ module Megam
           Megam::MarketPlaceAddonsCollection
         when MEGAM_ORGANIZATION
           Megam::Organizations
+        when MEGAM_ORGANIZATIONSCOLLECTION
+          Megam::OrganizationsCollection
         when MEGAM_CSAR
           Megam::CSAR
         when MEGAM_CSARCOLLECTION

data/lib/megam/core/organizations_collection.rb

@@ -0,0 +1,168 @@
+# Copyright:: Copyright (c) 2012, 2014 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 OrganizationsCollection
+    include Enumerable
+
+    attr_reader :iterator
+    def initialize
+      @organizations = Array.new
+      @organizations_by_name = Hash.new
+      @insert_after_idx = nil
+    end
+
+    def all_organizations
+      @organizations
+    end
+
+    def [](index)
+      @organizations[index]
+    end
+
+    def []=(index, arg)
+      is_megam_organizations(arg)
+      @organizations[index] = arg
+      @organizations_by_name[arg.name] = index
+    end
+
+    def <<(*args)
+      args.flatten.each do |a|
+        is_megam_organizations(a)
+        @organizations << a
+        @organizations_by_name[a.name] =@organizations.length - 1
+      end
+      self
+    end
+
+    # 'push' is an alias method to <<
+    alias_method :push, :<<
+
+    def insert(organizations)
+      is_megam_organizations(organizations)
+      if @insert_after_idx
+        # in the middle of executing a run, so any predefs inserted now should
+        # be placed after the most recent addition done by the currently executing
+        # predefclouds
+        @organizations.insert(@insert_after_idx + 1, organizations)
+        # update name -> location mappings and register new predefclouds
+        @organizations_by_name.each_key do |key|
+        @organizations_by_name[key] += 1 if@organizations_by_name[key] > @insert_after_idx
+        end
+        @organizations_by_name[organizations.name] = @insert_after_idx + 1
+        @insert_after_idx += 1
+      else
+      @organizations << organizations
+      @organizations_by_name[organizations.name] =@organizations.length - 1
+      end
+    end
+
+    def each
+      @organizations.each do |organizations|
+        yield organizations
+      end
+    end
+
+    def each_index
+      @organizations.each_index do |i|
+        yield i
+      end
+    end
+
+    def empty?
+      @organizations.empty?
+    end
+
+    def lookup(organizations)
+      lookup_by = nil
+      if organizations.kind_of?(Megam::Organizations)
+      lookup_by = organizations.name
+      elsif organizations.kind_of?(String)
+      lookup_by = organizations
+      else
+        raise ArgumentError, "Must pass a Megam::PredefClouds or String to lookup"
+      end
+      res =@organizations_by_name[lookup_by]
+      unless res
+        raise ArgumentError, "Cannot find a predefclouds matching #{lookup_by} (did you define it first?)"
+      end
+      @organizations[res]
+    end
+
+    # Transform the ruby obj ->  to a Hash
+    def to_hash
+      index_hash = Hash.new
+      self.each do |organizations|
+        index_hash[organizations.name] = organizations.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
+
+=begin
+{
+"json_claz":"Megam::PredefCloudCollection",
+"results":[{
+"id":"NOD362554470640386048",
+"name":"ec2_rails",
+"account_id":"ACT362544229488001024",
+"json_claz":"Megam::PredefCloud",
+"spec":{
+"type_name":"sensor-type",
+"groups":"sens-group",
+"image":"sens-image",
+"flavor":"sens-flvr"
+},
+"access":{
+"ssh_key":"sens-ssh",
+"identity_file":"sens-identity-file",
+"ssh_user":"sens-sshuser"
+},
+"ideal":"",
+"performance":""
+}]
+}
+=end
+    def self.json_create(o)
+      collection = self.new()
+      o["results"].each do |organizations_list|
+        organizations_array = organizations_list.kind_of?(Array) ? organizations_list : [ organizations_list ]
+        organizations_array.each do |organizations|
+          collection.insert(organizations)
+        end
+      end
+      collection
+    end
+
+    private
+
+    def is_megam_organizations(arg)
+      unless arg.kind_of?(Megam::Organizations)
+        raise ArgumentError, "Members must be Megam::Organizations's"
+      end
+      true
+    end
+
+    def to_s
+      Megam::Stuff.styled_hash(to_hash)
+    end
+
+  end
+end

data/test/test_organizations.rb

@@ -7,15 +7,10 @@ class TestOrganizations < MiniTest::Unit::TestCase
   $tom_email = "tom@gomegam.com"
   $bob_email = "bob@gomegam.com"
 
- def test_get_organizations_good1
-    response =megams.get_organizations
-    response.body.to_s
-    assert_equal(200, response.status)
- end
  
-=begin
-  
 
+
+=begin
   def test_get_organizations_good
     response =megams.get_organization(sandbox_name)
     response.body.to_s
@@ -25,10 +20,16 @@ class TestOrganizations < MiniTest::Unit::TestCase
 
   def test_post_organizations_good
     tmp_hash = {
-     "name" => "orgname3"}
+     "name" => "org.megam"}
     response =megams.post_organization(tmp_hash)
     response.body.to_s
     assert_equal(201, response.status)
   end
-=end
+=end 
+
+def test_get_organizations_good1
+    response =megams.get_organizations
+     assert_equal(200, response.status)
+ end
+
 end

data/test/test_predefclouds.rb

@@ -1,7 +1,7 @@
 require File.expand_path("#{File.dirname(__FILE__)}/test_helper")
 
 class TestApps < MiniTest::Unit::TestCase
-
+=begin
   def test_post_predefcloud1
     tmp_hash = { :name => "aws_ec2_predef_medium", :spec => {
         :type_name => "aws-ec2",
@@ -26,6 +26,8 @@ class TestApps < MiniTest::Unit::TestCase
     response = megams.post_predefcloud(tmp_hash)
     assert_equal(201, response.status)
   end
+=end
+=begin
 #=end
   def test_post_predefcloud2
     tmp_hash = { :name => "rkspce_sundown_play", :spec => {
@@ -50,7 +52,7 @@ class TestApps < MiniTest::Unit::TestCase
     response = megams.post_predefcloud(tmp_hash)
     assert_equal(201, response.status)
   end
-
+=end
 #=begin
 
   def test_get_predefclouds
@@ -58,7 +60,7 @@ class TestApps < MiniTest::Unit::TestCase
     assert_equal(200, response.status)
   end
 #=end
-
+=begin
   def test_get_predefcloud2
     response = megams.get_predefcloud("rkspce_sundown_play")
     assert_equal(200, response.status)
@@ -74,6 +76,6 @@ assert_raises(Megam::API::Errors::NotFound) do
 megams.get_predefcloud("stupid.megam.co")
 end
 end
-#=end
+=end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: megam_api
 version: !ruby/object:Gem::Version
-  version: '0.22'
+  version: '0.23'
 platform: ruby
 authors:
 - Kishorekumar Neelamegam, Thomas Alrin, Subash Sethurajan, Rajthilak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-25 00:00:00.000000000 Z
+date: 2014-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -172,6 +172,7 @@ files:
 - lib/megam/core/marketplace_collection.rb
 - lib/megam/core/monologger.rb
 - lib/megam/core/organizations.rb
+- lib/megam/core/organizations_collection.rb
 - lib/megam/core/predefcloud.rb
 - lib/megam/core/predefcloud_collection.rb
 - lib/megam/core/request.rb