megam_api 0.100 → 1.5.beta2

data/lib/megam/core/stuff.rb

@@ -27,43 +27,11 @@ module Megam
       %x{ git #{flattened_args} 2>&1 }.strip
     end
 
-    def time_ago(since)
-      if since.is_a?(String)
-        since = Time.parse(since)
-      end
-
-      elapsed = Time.now - since
-
-      message = since.strftime("%Y/%m/%d %H:%M:%S")
-      if elapsed <= 60
-        message << " (~ #{elapsed.floor}s ago)"
-      elsif elapsed <= (60 * 60)
-        message << " (~ #{(elapsed / 60).floor}m ago)"
-      elsif elapsed <= (60 * 60 * 25)
-        message << " (~ #{(elapsed / 60 / 60).floor}h ago)"
-      end
-      message
-    end
-
-    def spinner(ticks)
-      %w(/ - \\ |)[ticks % 4]
-    end
-
-    def launchy(message, url)
-      action(message) do
-        require("launchy")
-        launchy = Launchy.open(url)
-        if launchy.respond_to?(:join)
-        launchy.join
-        end
-      end
-    end
-
-    #
+            #
     #left justified keyed hash with newlines.
     def styled_hash(hash)
       hash.map{|k,v| "#{k.ljust(15)}=#{v}"}.join("\n")
     end
 
   end
-end
+end

data/lib/megam/core/text.rb

@@ -21,6 +21,7 @@ module Megam
     attr_reader :stderr
     attr_reader :stdin
     attr_reader :config
+    
     def initialize(stdout, stderr, stdin, config)
       @stdout, @stderr, @stdin, @config = stdout, stderr, stdin, config
     end

data/lib/megam/core/text_formatter.rb

@@ -3,6 +3,7 @@ module Megam
 
     attr_reader :data
     attr_reader :ui
+    
     def initialize(data, ui)
       @ui = ui
       @data = if data.respond_to?(:display_hash)
@@ -58,6 +59,6 @@ module Megam
     def is_singleton(value)
       !(value.kind_of?(Array) || value.respond_to?(:keys))
     end
-    
+
   end
 end

data/megam_api.gemspec

@@ -16,9 +16,9 @@ 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', '~> 0.47.0'
+  s.add_runtime_dependency 'excon', '~> 0.49.0'
   s.add_runtime_dependency 'highline', '~> 1.7'
-  s.add_runtime_dependency 'yajl-ruby', '~> 1.2'
+  s.add_runtime_dependency 'ffi-yajl', '~> 2.2'
   s.add_runtime_dependency 'mixlib-config', '~> 2.2'
   s.add_runtime_dependency 'mixlib-log', '~> 1.6'
   s.add_development_dependency 'minitest', '~> 5.8'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: megam_api
 version: !ruby/object:Gem::Version
-  version: '0.100'
+  version: 1.5.beta2
 platform: ruby
 authors:
 - Rajthilak, Kishorekumar Neelamegam, Thomas Alrin, Yeshwanth Kumar, Subash Sethurajan,
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-18 00:00:00.000000000 Z
+date: 2016-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.47.0
+        version: 0.49.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.47.0
+        version: 0.49.0
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -40,19 +40,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
-  name: yajl-ruby
+  name: ffi-yajl
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: mixlib-config
   requirement: !ruby/object:Gem::Requirement
@@ -136,54 +136,32 @@ files:
 - lib/megam/api/accounts.rb
 - lib/megam/api/assemblies.rb
 - lib/megam/api/assembly.rb
-- lib/megam/api/availableunits.rb
 - lib/megam/api/balances.rb
 - lib/megam/api/billedhistories.rb
-- lib/megam/api/billings.rb
 - lib/megam/api/components.rb
-- lib/megam/api/credithistories.rb
-- lib/megam/api/csars.rb
-- lib/megam/api/discounts.rb
 - lib/megam/api/domains.rb
 - lib/megam/api/errors.rb
-- lib/megam/api/invoices.rb
-- lib/megam/api/login.rb
 - lib/megam/api/marketplaces.rb
 - lib/megam/api/organizations.rb
 - lib/megam/api/promos.rb
 - lib/megam/api/requests.rb
 - lib/megam/api/sensors.rb
 - lib/megam/api/sshkeys.rb
-- lib/megam/api/subscriptions.rb
 - lib/megam/api/version.rb
 - lib/megam/core/account.rb
 - lib/megam/core/assemblies.rb
 - lib/megam/core/assemblies_collection.rb
 - lib/megam/core/assembly.rb
 - lib/megam/core/assembly_collection.rb
-- lib/megam/core/auth.rb
-- lib/megam/core/availableunits.rb
-- lib/megam/core/availableunits_collection.rb
 - lib/megam/core/balances.rb
 - lib/megam/core/balances_collection.rb
 - lib/megam/core/billedhistories.rb
 - lib/megam/core/billedhistories_collection.rb
-- lib/megam/core/billings.rb
-- lib/megam/core/billings_collection.rb
 - lib/megam/core/components.rb
 - lib/megam/core/components_collection.rb
-- lib/megam/core/config.rb
-- lib/megam/core/credithistories.rb
-- lib/megam/core/credithistories_collection.rb
-- lib/megam/core/csar.rb
-- lib/megam/core/csar_collection.rb
-- lib/megam/core/discounts.rb
-- lib/megam/core/discounts_collection.rb
 - lib/megam/core/domain_collection.rb
 - lib/megam/core/domains.rb
 - lib/megam/core/error.rb
-- lib/megam/core/invoices.rb
-- lib/megam/core/invoices_collection.rb
 - lib/megam/core/json_compat.rb
 - lib/megam/core/konipai.rb
 - lib/megam/core/log.rb
@@ -195,14 +173,12 @@ files:
 - lib/megam/core/promos.rb
 - lib/megam/core/request.rb
 - lib/megam/core/request_collection.rb
+- lib/megam/core/rest_adapter.rb
 - lib/megam/core/sensors.rb
 - lib/megam/core/sensors_collection.rb
-- lib/megam/core/server_api.rb
 - lib/megam/core/sshkey.rb
 - lib/megam/core/sshkey_collection.rb
 - lib/megam/core/stuff.rb
-- lib/megam/core/subscriptions.rb
-- lib/megam/core/subscriptions_collection.rb
 - lib/megam/core/text.rb
 - lib/megam/core/text_formatter.rb
 - lib/megam/mixins/assemblies.rb
@@ -220,28 +196,17 @@ files:
 - test/test_accounts.rb
 - test/test_assemblies.rb
 - test/test_assembly.rb
-- test/test_availableunits.rb
 - test/test_balances.rb
 - test/test_billedhistories.rb
-- test/test_billings.rb
-- test/test_cat_requests.rb
 - test/test_components.rb
-- test/test_credithistories.rb
-- test/test_csars.rb
-- test/test_discounts.rb
 - test/test_domains.rb
 - test/test_helper.rb
-- test/test_invoices.rb
-- test/test_login.rb
-- test/test_marketplaceaddons.rb
 - test/test_marketplaces.rb
 - test/test_organizations.rb
-- test/test_predefclouds.rb
 - test/test_promos.rb
 - test/test_requests.rb
 - test/test_sensors.rb
 - test/test_sshkeys.rb
-- test/test_subscriptions.rb
 homepage: http://github.com/megamsys/megam_api
 licenses:
 - Apache-2.0
@@ -257,9 +222,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1
@@ -273,25 +238,14 @@ test_files:
 - test/test_accounts.rb
 - test/test_assemblies.rb
 - test/test_assembly.rb
-- test/test_availableunits.rb
 - test/test_balances.rb
 - test/test_billedhistories.rb
-- test/test_billings.rb
-- test/test_cat_requests.rb
 - test/test_components.rb
-- test/test_credithistories.rb
-- test/test_csars.rb
-- test/test_discounts.rb
 - test/test_domains.rb
 - test/test_helper.rb
-- test/test_invoices.rb
-- test/test_login.rb
-- test/test_marketplaceaddons.rb
 - test/test_marketplaces.rb
 - test/test_organizations.rb
-- test/test_predefclouds.rb
 - test/test_promos.rb
 - test/test_requests.rb
 - test/test_sensors.rb
 - test/test_sshkeys.rb
-- test/test_subscriptions.rb

data/lib/megam/api/availableunits.rb

@@ -1,50 +0,0 @@
-# Copyright:: Copyright (c) 2013-2016 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 API
-    def get_availableunits
-      @options = {:path => '/availableunits',:body => ""}.merge(@options)
-
-      request(
-        :expects  => 200,
-        :method   => :get,
-        :body     => @options[:body]
-      )
-    end
-
-    def get_availableunit(id)
-      @options = {:path => "/availableunits/#{id}",:body => ""}.merge(@options)
-
-      request(
-        :expects  => 200,
-        :method   => :get,
-        :body     => @options[:body]
-      )
-    end
-
-    def post_availableunits(new_availableunit)
-      @options = {:path => '/availableunits/content',
-        :body => Megam::JSONCompat.to_json(new_availableunit)}.merge(@options)
-
-      request(
-        :expects  => 201,
-        :method   => :post,
-        :body     => @options[:body]
-      )
-    end
-
-  end
-end

data/lib/megam/api/billings.rb

@@ -1,50 +0,0 @@
-# Copyright:: Copyright (c) 2013-2016 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 API
-    def get_billings
-      @options = {:path => '/billings',:body => ""}.merge(@options)
-
-      request(
-        :expects  => 200,
-        :method   => :get,
-        :body     => @options[:body]
-      )
-    end
-
-    def get_billing(id)
-      @options = {:path => "/billings/#{id}",:body => ""}.merge(@options)
-
-      request(
-        :expects  => 200,
-        :method   => :get,
-        :body     => @options[:body]
-      )
-    end
-
-    def post_billings(new_billing)
-      @options = {:path => '/billings/content',
-        :body => Megam::JSONCompat.to_json(new_billing)}.merge(@options)
-
-      request(
-        :expects  => 201,
-        :method   => :post,
-        :body     => @options[:body]
-      )
-    end
-
-  end
-end

data/lib/megam/api/credithistories.rb

@@ -1,50 +0,0 @@
-# Copyright:: Copyright (c) 2013-2016 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 API
-    def get_credithistories
-      @options = {:path => '/credithistories',:body => ""}.merge(@options)
-
-      request(
-        :expects  => 200,
-        :method   => :get,
-        :body     => @options[:body]
-      )
-    end
-
-    def get_credithistories(id)
-      @options = {:path => "/credithistories/#{id}",:body => ""}.merge(@options)
-
-      request(
-        :expects  => 200,
-        :method   => :get,
-        :body     => @options[:body]
-      )
-    end
-
-    def post_credithistories(new_credithistories)
-      @options = {:path => '/credithistories/content',
-        :body => Megam::JSONCompat.to_json(new_credithistories)}.merge(@options)
-
-      request(
-        :expects  => 201,
-        :method   => :post,
-        :body     => @options[:body]
-      )
-    end
-
-  end
-end

data/lib/megam/api/csars.rb

@@ -1,75 +0,0 @@
-# Copyright:: Copyright (c) 2013-2016 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 API
-
-    # GET /csars
-    def get_csars
-      @options = {:path => '/csars',:body => ""}.merge(@options)
-
-      request(
-        :expects  => 200,
-        :method   => :get,
-        :body     => @options[:body]
-      )
-    end
-
-    def get_csar(id)
-      @options = {:path => "/csars/#{id}",:body => ""}.merge(@options)
-
-      request(
-        :expects  => 200,
-        :method   => :get,
-        :body     => @options[:body]
-      )
-    end
-
-    def post_csar(new_csar)
-      @options = {:path => '/csars/content',
-        :body => new_csar}.merge(@options)
-
-      request(
-        :expects  => 201,
-        :method   => :post,
-        :body     => @options[:body]
-      )
-    end
-
-    def push_csar(id)
-      @options = {:path => "/csars/push/#{id}",:body => ""}.merge(@options)
-
-      request(
-        :expects  => 201,
-        :method   => :get,
-        :body     => @options[:body]
-      )
-    end
-
-    #Yet to be tested
-    # DELETE /marketplacess/:node_id
-    def delete_marketplaceapp(node_id)
-      @options = {:path => '/marketplaces/#{node_id}',
-        :body => ""}.merge(@options)
-
-      request(
-        :expects  => 200,
-        :method   => :delete,
-        :body     => @options[:body]
-      )
-    end
-
-  end
-end