megam_api 0.7.0 → 0.7.1

data/lib/megam/core/predefcloud.rb

@@ -1,3 +1,4 @@
+
 # Copyright:: Copyright (c) 2012, 2013 Megam Systems
 # License:: Apache License, Version 2.0
 #
@@ -167,6 +168,7 @@ module Megam
       predefcd.access[:ssh_user]= op["ssh_user"] if op && op.has_key?("ssh_user")
       predefcd.access[:vault_location]= op["vault_location"] if op && op.has_key?("vault_location")
       predefcd.access[:sshpub_location]= op["sshpub_location"] if op && op.has_key?("sshpub_location")
+      predefcd.access[:zone]= op["zone"] if op && op.has_key?("zone")
       #access
      # predefcd.ideal(o["ideal"]) if o.has_key?("ideal")
      # predefcd.performance(o["performance"]) if o.has_key?("performance")
@@ -210,14 +212,14 @@ module Megam
     # returns a PredefsCollection
     # don't return self. check if the Megam::PredefCollection is returned.
     def self.list
-	predef = self.new()
+    predef = self.new()
       predef.megam_rest.get_predefclouds
     end
 
     # Show a particular predef by name,
     # Megam::Predef
     def self.show(p_name)
-	pre = self.new()
+    pre = self.new()
       pre.megam_rest.get_predefcloud(p_name)
     end
 

data/lib/megam/core/text.rb

@@ -13,6 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+require "megam/core/text_formatter"
 module Megam
   class Text
 
@@ -31,6 +32,18 @@ module Megam
       end
     end
 
+    # Summarize the data. Defaults to text format output,
+    # which may not be very summary-like
+    def summarize(data)
+      text_format(data)
+    end
+
+    # Converts the +data+ to a String in the text format. Uses
+    # Chef::Knife::Core::TextFormatter
+    def text_format(data)
+      Megam::TextFormatter.new(data, self).formatted_data
+    end
+
     def msg(message)
       stdout.puts message
     end

data/lib/megam/core/text_formatter.rb

@@ -0,0 +1,63 @@
+module Megam
+  class TextFormatter
+
+    attr_reader :data
+    attr_reader :ui
+    def initialize(data, ui)
+      @ui = ui
+      @data = if data.respond_to?(:display_hash)
+            data.display_hash
+          elsif data.kind_of?(Array)
+            data
+          elsif data.respond_to?(:to_hash)
+            data.to_hash
+          else
+            data
+          end
+    end
+
+    def formatted_data
+      @formatted_data ||= text_format(data)
+    end
+
+    def text_format(data)
+      buffer = ''
+
+      if data.respond_to?(:keys)
+        justify_width = data.keys.map {|k| k.to_s.size }.max.to_i + 1
+        data.sort.each do |key, value|
+        # key: ['value'] should be printed as key: value
+          if value.kind_of?(Array) && value.size == 1 && is_singleton(value[0])
+          value = value[0]
+          end
+          if is_singleton(value)
+            # Strings are printed as key: value.
+            justified_key = ui.color("#{key}:".ljust(justify_width), :cyan)
+            buffer << "#{justified_key} #{value}\n"
+          else
+          # Arrays and hashes get indented on their own lines.
+            buffer << ui.color("#{key}:\n", :cyan)
+            lines = text_format(value).split("\n")
+            lines.each { |line| buffer << "  #{line}\n" }
+          end
+        end
+      elsif data.kind_of?(Array)
+        data.each_index do |index|
+          item = data[index]
+          buffer << text_format(data[index])
+          # Separate items with newlines if it's an array of hashes or an
+          # array of arrays
+          buffer << "\n" if !is_singleton(data[index]) && index != data.size-1
+        end
+      else
+        buffer << "#{data}\n"
+      end
+      buffer
+    end
+
+    def is_singleton(value)
+      !(value.kind_of?(Array) || value.respond_to?(:keys))
+    end
+    
+  end
+end

data/megam_api.gemspec

@@ -10,11 +10,11 @@ Gem::Specification.new do |s|
   s.homepage    = "http://github.com/indykish/megam_api"
   s.license = "Apache V2"
   sextra_rdoc_files = ["README.md", "LICENSE" ]
-  s.summary     = %q{Ruby Client for the Megam Cloud}
+  s.summary = %q{Ruby Client for the Megam Cloud}
   s.description = %q{Ruby Client for the Megam Cloud. Performs REST based HTTP calls to api.megam.co http://github.com/indykish/megam_play.git}
-  s.files         = `git ls-files`.split("\n")
-  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.files = `git ls-files`.split("\n")
+  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'

data/test/test_accounts.rb

@@ -6,12 +6,13 @@ class TestAccounts < MiniTest::Unit::TestCase
   $normal = "normal-tom"
 
   def test_get_accounts_good
-    response =megams.get_accounts(sandbox_email)
+    #response =megams.get_accounts(sandbox_email)
+    response =megams.get_accounts('a@b.com')
     response.body.to_s
     assert_equal(200, response.status)
   end
   
-
+=begin
   def test_get_accounts_bad
     assert_raises(Megam::API::Errors::NotFound) do
     response =megams.get_accounts(sandbox_email+"_bad")
@@ -41,6 +42,6 @@ class TestAccounts < MiniTest::Unit::TestCase
     response.body.to_s
     end    
   end
-
+=end
 end
 

data/test/test_cloudtoolsettings.rb

@@ -0,0 +1,49 @@
+require File.expand_path("#{File.dirname(__FILE__)}/test_helper")
+
+class TestApps < MiniTest::Unit::TestCase
+=begin
+  def test_post_cloudtoolsetting1
+    tmp_hash = { :cloud_type => "chef", 
+                 :repo => "https://github.com"
+                 :vault_location => "https://s3-ap-southeast-1.amazonaws.com/cloudkeys/sandy@megamsandbox.com/default"  
+    }
+
+    response = megams.post_cloudtoolsetting(tmp_hash)
+    assert_equal(201, response.status)
+  end
+=end
+=begin
+  def test_post_cloudtoolsetting2
+    tmp_hash = { :cloud_type => "chef", 
+                 :repo => "https://github.com",
+                 :vault_location => "https://s3-ap-southeast-1.amazonaws.com/cloudkeys/sandy@megamsandbox.com/default"  
+    }
+    response = megams.post_cloudtoolsetting(tmp_hash)
+    assert_equal(201, response.status)
+  end
+=end
+#=begin
+  def test_get_cloudtoolsettings
+    response = megams.get_cloudtoolsettings
+    assert_equal(200, response.status)
+  end
+#=end
+=begin
+  def test_get_cloudtoolsetting2
+    response = megams.get_cloudtoolsetting("rkspce_sundown_play")
+    assert_equal(200, response.status)
+  end
+#=begin
+  def test_get_cloudtoolsetting1
+    response = megams.get_cloudtoolsetting("iaas_default")
+    assert_equal(200, response.status)
+  end
+
+def test_get_cloudtoolsetting_not_found
+assert_raises(Megam::API::Errors::NotFound) do
+megams.get_cloudtoolsetting("stupid.megam.co")
+end
+end
+=end
+end
+

data/test/test_helper.rb

@@ -33,6 +33,7 @@ s_options = SANDBOX_HOST_OPTIONS.merge({
   :email => sandbox_email,
   :api_key => sandbox_apikey  
 }) 
+Megam::Log.level(:debug)
   options = s_options.merge(options)
   mg=Megam::API.new(options)  
 end

data/test/test_nodes.rb

@@ -22,7 +22,8 @@ class TestApps < MiniTest::Unit::TestCase
 "identity_file" => "~/.ssh/megam_ec2.pem",
 "ssh_user" => "ubuntu",
 "vault_location" => "https://s3-ap-southeast-1.amazonaws.com/cloudkeys/sandy@megamsandbox.com/default",
-"sshpub_location" => "https://s3-ap-southeast-1.amazonaws.com/cloudkeys/sandy@megamsandbox.com/default"
+"sshpub_location" => "https://s3-ap-southeast-1.amazonaws.com/cloudkeys/sandy@megamsandbox.com/default",
+"zone" => ""
 }
 },
 "cloudtool" => {
@@ -118,7 +119,9 @@ end
 "ssh_key" => "megam_ec2",
 "identity_file" => "~/.ssh/megam_ec2.pem",
 "ssh_user" => "",
-"vault_location" => "https://s3-ap-southeast-1.amazonaws.com/cloudkeys/sandy@megamsandbox.com/default"
+"vault_location" => "https://s3-ap-southeast-1.amazonaws.com/cloudkeys/sandy@megamsandbox.com/default",
+"sshpub_location" => "",
+"zone" => ""
 }
 },
 "cloudtool" => {

data/test/test_predefclouds.rb

@@ -14,10 +14,11 @@ class TestApps < MiniTest::Unit::TestCase
         :identity_file => "~/.ssh/megam_ec2.pem",
         :ssh_user => "ubuntu",
 	:vault_location => "https://s3-ap-southeast-1.amazonaws.com/cloudkeys/sandy@megamsandbox.com/default",
-	:sshpub_location => "https://s3-ap-southeast-1.amazonaws.com/cloudkeys/sandy@megamsandbox.com/default"
+	:sshpub_location => "https://s3-ap-southeast-1.amazonaws.com/cloudkeys/sandy@megamsandbox.com/default",
+	:zone => ""
       },
-      :ideal => "ror,redis,riak",
-      :performance => "10rpm"
+      #:ideal => "ror,redis,riak",
+      #:performance => "10rpm"
     }
 
     response = megams.post_predefcloud(tmp_hash)
@@ -36,10 +37,11 @@ class TestApps < MiniTest::Unit::TestCase
         :identity_file => "https://boering.dropbox.closedloc/aorc.pem",
         :ssh_user => "ubuntu",
 	:vault_location => "https://s3-ap-southeast-1.amazonaws.com/cloudkeys/sandy@megamsandbox.com/default",
-	:sshpub_location => "https://s3-ap-southeast-1.amazonaws.com/cloudkeys/sandy@megamsandbox.com/default"
+	:sshpub_location => "https://s3-ap-southeast-1.amazonaws.com/cloudkeys/sandy@megamsandbox.com/default",
+	:zone => ""
       },
-      :ideal => "play,redis,riak",
-      :performance => "10rpm"
+      #:ideal => "play,redis,riak",
+      #:performance => "10rpm"
     }
     response = megams.post_predefcloud(tmp_hash)
     assert_equal(201, response.status)

data/test/test_requests.rb

@@ -38,7 +38,9 @@ class TestApps < MiniTest::Unit::TestCase
 "ssh_key" => "megam_ec2",
 "identity_file" => "~/.ssh/megam_ec2.pem",
 "ssh_user" => "",
-"vault_location" => "https://s3-ap-southeast-1.amazonaws.com/cloudkeys/sandy@megamsandbox.com/default"
+"vault_location" => "https://s3-ap-southeast-1.amazonaws.com/cloudkeys/sandy@megamsandbox.com/default",
+"sshpub_location" => "",
+"zone" => ""
 }
 },
 "cloudtool" => {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: megam_api
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Kishorekumar Neelamegam, Thomas Alrin, Subash Sethurajan, Rajthilak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-04 00:00:00.000000000 Z
+date: 2013-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -123,6 +123,7 @@ files:
 - .project
 - .travis.yml
 - Gemfile
+- LICENSE
 - README.md
 - Rakefile
 - lib/certs/cacert.pem
@@ -132,6 +133,7 @@ files:
 - lib/megam/api/appdefns.rb
 - lib/megam/api/bolt_request.rb
 - lib/megam/api/boltdefns.rb
+- lib/megam/api/cloud_tool_settings.rb
 - lib/megam/api/cloud_tools.rb
 - lib/megam/api/errors.rb
 - lib/megam/api/login.rb
@@ -160,10 +162,13 @@ files:
 - lib/megam/core/cloudtemplate_collection.rb
 - lib/megam/core/cloudtool.rb
 - lib/megam/core/cloudtool_collection.rb
+- lib/megam/core/cloudtoolsetting.rb
+- lib/megam/core/cloudtoolsetting_collection.rb
 - lib/megam/core/config.rb
 - lib/megam/core/error.rb
 - lib/megam/core/json_compat.rb
 - lib/megam/core/log.rb
+- lib/megam/core/monologger.rb
 - lib/megam/core/node.rb
 - lib/megam/core/node_collection.rb
 - lib/megam/core/predef.rb
@@ -174,6 +179,7 @@ files:
 - lib/megam/core/request_collection.rb
 - lib/megam/core/stuff.rb
 - lib/megam/core/text.rb
+- lib/megam/core/text_formatter.rb
 - lib/megam_api.rb
 - megam_api.gemspec
 - test/test_accounts.rb
@@ -182,6 +188,7 @@ files:
 - test/test_boltdefns.rb
 - test/test_boltreqs.rb
 - test/test_cloudtools.rb
+- test/test_cloudtoolsettings.rb
 - test/test_helper.rb
 - test/test_login.rb
 - test/test_logs.rb