podnix 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b410c0fe8125604df4f3b6959bb1aebbc7f081d1
-  data.tar.gz: 91729b65fcb9c44644fe191a6fd80d369a1ec262
+  metadata.gz: a349b4dd9627768d083336b20bb6bc9edc8137a8
+  data.tar.gz: 6ea2a8b1a4d1ac62331d731f70e9c89f7d8027ea
 SHA512:
-  metadata.gz: dc0efb434667656459d7de1b25b39d8eadbf0eb86e22bd319bbe64308257443580c0fd2f7c36920704dddf0eb0c72b0b77e07069f66d93abc774e52d9be6e314
-  data.tar.gz: c608b141688693650d09535632c6f9d6e5857c2df4ab840e93f7432e07d1d3133b4b93b095cea1091679be4a5f548a35856b314ce5088895ad8113aaaf1657e2
+  metadata.gz: 76783f66dcc6572d0ee902ddd8854f5fdee4050d10be68da51aec442566122d4bff0ac18bc71d67b636630874c7376b36b9923dc2e50e29171df75d44de5cb5e
+  data.tar.gz: 88d5c594b87b44570aa4e5f4d6071fc8e2961b8984c90520895614ad846b40c8ed4b6d3d6122b832e440ab12f2dea5300651dc13660c7f68850985456400b0cd

data/lib/podnix/api.rb

@@ -19,14 +19,7 @@ require "podnix/api/version"
 require "podnix/api/images"
 require "podnix/api/models"
 require "podnix/api/servers"
-require "podnix/core/stuff"
 require "podnix/core/text"
-require "podnix/core/json_compat"
-require "podnix/core/error"
-require "podnix/core/images"
-require "podnix/core/images_collection"
-require "podnix/core/server"
-require "podnix/core/server_collection"
 
 #we may nuke logs out of the api
 #require "megam/api/logs"
@@ -49,7 +42,6 @@ module Podnix
     }
     
     QUERY = {
-    :key => ENV['PODNIX_API_KEY']
     }
 
     OPTIONS = {
@@ -79,9 +71,9 @@ module Podnix
     # 3. Upon merge of the options, the api_key, email as available in the @options is deleted.
     def initialize(options={})
        @options = OPTIONS.merge(options)
-      @api_key = @options.delete(:api_key) || ENV['PODNIX_API_KEY']
-      #@email = @options.delete(:email)
-      raise ArgumentError, "You must specify [:email, :api_key]" if @api_key.nil?
+       @key = options[:key]
+         @options[:query] = QUERY.merge(options)
+      raise ArgumentError, "You must specify podnix_api_key in knife.rb or ENV['PODNIX_API_KEY']" if @key.empty? && !ENV['PODNIX_API_KEY']
     end
 
     def request(params,&block)
@@ -163,8 +155,10 @@ module Podnix
     #Make a lazy connection.
     def connection
 
-      #@options[:path]=@options[:path]+'&key='+"#{ENV['PODNIX_API_KEY']}"
-      @options[:query] = QUERY.merge(@options[:query])
+if ENV['PODNIX_API_KEY'] && @options[:query][:key].empty?
+	QUERY[:key]="#{ENV['PODNIX_API_KEY']}"
+      @options[:query] = @options[:query].merge(QUERY)
+end
       @options[:headers] = HEADERS.merge(@options[:headers])
 
       #SSL certificate file paths

data/lib/podnix/api/servers.rb

@@ -28,7 +28,7 @@ module Podnix
 	@options = { :path => "/servers/add",:body => ""}.merge(@options)
 	     @options[:query] = @options[:query].merge(new_server)
       request(
-        :expects  => 201,
+        :expects  => 200,
         :method   => :post,
         :body     => @options[:body]
       )

data/lib/podnix/api/version.rb

@@ -1,5 +1,5 @@
 module Podnix
   class API
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

data/test/test_helper.rb

@@ -13,16 +13,7 @@ SANDBOX_HOST_OPTIONS = {
    
 }
 
-  def nested_merge(other_hash={})
-    merge(other_hash) do |key, oldval, newval|
-      if oldval.is_a? Hash
-        oldval.nested_merge(newval)
-      else
-        newval
-      end
-    end
-  end
-  
+
 def podnix(options={})  
 s_options = SANDBOX_HOST_OPTIONS.merge({
   :api_key => sandbox_apikey  

data/test/test_images.rb

@@ -6,6 +6,8 @@ class TestApps < MiniTest::Unit::TestCase
 
     response = podnix.get_images
     assert_equal(200, response.status)
+    response.data[:body]['data'].each do |im|
+    end
   end
 
 

data/test/test_servers.rb

@@ -5,8 +5,6 @@ class TestApps < MiniTest::Unit::TestCase
 # https://api.podnix.com/servers/list?key=XXX
   def test_get_servers
     response = podnix.get_servers
-    #puts "=================> Response ========>"
-    #puts response.inspect
     assert_equal(200, response.status)
   end
 
@@ -16,8 +14,6 @@ class TestApps < MiniTest::Unit::TestCase
 
   def test_get_server
     response = podnix.get_server({:id => '395'})
-    #puts "=================> Response ========>"
-    #puts response.inspect
     assert_equal(200, response.status)
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: podnix
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Kishorekumar Neelamegam, Thomas Alrin, Rajthilak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-06 00:00:00.000000000 Z
+date: 2013-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -121,15 +121,6 @@ files:
 - lib/podnix/api/models.rb
 - lib/podnix/api/servers.rb
 - lib/podnix/api/version.rb
-- lib/podnix/core/auth.rb
-- lib/podnix/core/config.rb
-- lib/podnix/core/error.rb
-- lib/podnix/core/images.rb
-- lib/podnix/core/images_collection.rb
-- lib/podnix/core/json_compat.rb
-- lib/podnix/core/server.rb
-- lib/podnix/core/server_collection.rb
-- lib/podnix/core/stuff.rb
 - lib/podnix/core/text.rb
 - podnix.gemspec
 - test/test_helper.rb

data/lib/podnix/core/auth.rb

@@ -1,91 +0,0 @@
-# Copyright:: Copyright (c) 2012-2013 Megam Systems, Inc.
-# 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 Podnix
-  class Auth
-    
-    def initialize
-      @some_msg = {}
-    end
-
-    #used by resque workers and any other background job
-    def auth
-      self
-    end
-
-    def podnix_rest
-      Podnix::API.new(Podnix::Config[:email], Podnix::Config[:api_key])
-    end
-
-    def some_msg(arg=nil)
-      if arg != nil
-        @some_msg = arg
-      else
-      @some_msg
-      end
-    end
-
-    def error?
-      crocked  = true if (some_msg.has_key?(:msg_type) && some_msg[:msg_type] == "error")
-    end
-
-    # Transform the ruby obj ->  to a Hash
-    def to_hash
-      index_hash = Hash.new
-      index_hash["json_claz"] = self.class.name
-      index_hash["some_msg"] = some_msg
-      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
-
-    def for_json
-      result = { }
-      result
-    end
-
-    # Create a Podnix::Account from JSON (used by the backgroud job workers)
-    def self.json_create(o)
-      acct = new
-      acct.some_msg[:code] = o["code"] if o.has_key?("code")
-      acct.some_msg[:msg_type] = o["msg_type"] if o.has_key?("msg_type")
-      acct.some_msg[:msg]= o["msg"] if o.has_key?("msg")
-      acct.some_msg[:links] = o["links"] if o.has_key?("links")
-      acct
-    end
-
-    def self.from_hash(o)
-      acct = self.new()
-      acct.from_hash(o)
-      acct
-    end
-
-    # just an auth
-    def self.auth
-      podnix_rest.post_auth
-      self
-    end
-
-
-    def to_s
-      Podnix::Stuff.styled_hash(to_hash)
-    #"---> Megam::Account:[error=#{error?}]\n"+
-    end
-  end
-end

data/lib/podnix/core/config.rb

@@ -1,44 +0,0 @@
-#
-# Copyright:: Copyright (c) 2012-2013 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.
-
-require 'mixlib/config'
-
-module Podnix
-  class Config
-
-    extend Mixlib::Config
-    
-    def self.inspect
-      configuration.inspect
-    end
-
-    podnix_api_server_url   "http://localhost:9000"
-    
-    podnix_api_version      "v1"
-
-    email nil
-    api_key nil
-
-    # Set these to enable SSL authentication / mutual-authentication
-    # with the server
-    ssl_client_cert nil
-    ssl_client_key nil
-    ssl_verify_mode :verify_none
-    ssl_ca_path nil
-    ssl_ca_file nil
-
-  end
-end

data/lib/podnix/core/error.rb

@@ -1,97 +0,0 @@
-# Copyright:: Copyright (c) 2012-2013 Megam Systems, Inc.
-# 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 Podnix
-  class Error
-    
-    def initialize
-      @some_msg = {}
-    end
-
-    #used by resque workers and any other background job
-    def auth
-      self
-    end
-
-    def podnix_rest
-      Podnix::API.new(Podnix::Config[:email], Podnix::Config[:api_key])
-    end
-
-    def some_msg(arg=nil)
-      if arg != nil
-        @some_msg = arg
-      else
-      @some_msg
-      end
-    end
-
-    def error?
-      crocked  = true if (some_msg.has_key?(:msg_type) && some_msg[:msg_type] == "error")
-    end
-
-    # Transform the ruby obj ->  to a Hash
-    def to_hash
-      index_hash = Hash.new
-      index_hash["json_claz"] = self.class.name
-      index_hash["some_msg"] = some_msg
-      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
-
-    def for_json
-      result = { }
-      result
-    end
-
-    # Create a Megam::Account from JSON (used by the backgroud job workers)
-    def self.json_create(o)
-      acct = new
-      acct.some_msg[:code] = o["code"] if o.has_key?("code")
-      acct.some_msg[:msg_type] = o["msg_type"] if o.has_key?("msg_type")
-      acct.some_msg[:msg]= o["msg"] if o.has_key?("msg")
-      acct.some_msg[:links] = o["links"] if o.has_key?("links")
-      acct
-    end
-
-    def self.from_hash(o)
-      acct = self.new()
-      acct.from_hash(o)
-      acct
-    end
-
-    def from_hash(o)
-      @some_msg[:code] = o["code"] if o.has_key?("code")
-      @some_msg[:msg_type] = o["msg_type"] if o.has_key?("msg_type")
-      @some_msg[:msg]= o["msg"] if o.has_key?("msg")
-      @some_msg[:links] = o["links"] if o.has_key?("links")
-      self
-    end
-
-    # just an auth
-    def self.auth
-      podnix_rest.post_auth
-      self
-    end
-
-
-    def to_s
-      Podnix::Stuff.styled_hash(to_hash)    end
-  end
-end

data/lib/podnix/core/images.rb

@@ -1,239 +0,0 @@
-# Copyright:: Copyright (c) 2012, 2013 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 Podnix
-  class AppRequest
-    # Each notify entry is a resource/action pair, modeled as an
-    # Struct with a #resource and #action member
-=begin
-  def self.hash_tree
-    Hash.new do |hash, key|
-      hash[key] = hash_tree
-    end
-  end
-=end
-
-    def initialize
-      @id = nil
-      @req_type = nil
-      @appdefns_id = nil
-      @node_name = nil
-      @lc_apply = nil
-      @lc_additional = nil
-      @lc_when = nil
-      @created_at = nil
-      @some_msg = {}
-    end
-    def appreq
-      self
-    end
-
-    def podnix_rest
-      options = { :email => Megam::Config[:email], :api_key => Megam::Config[:api_key]}
-      Podnix::API.new(options)
-    end
-
-    def id(arg=nil)
-      if arg != nil
-        @id = arg
-      else
-      @id
-      end
-    end
-
-    def req_type(arg=nil)
-      if arg != nil
-        @req_type = arg
-      else
-      @req_type
-      end
-    end
-
-    def appdefns_id(arg=nil)
-      if arg != nil
-        @appdefns_id = arg
-      else
-      @appdefns_id
-      end
-    end
-
-    def node_name(arg=nil)
-      if arg != nil
-        @node_name = arg
-      else
-      @node_name
-      end
-    end
-
-    def lc_apply(arg=nil)
-      if arg != nil
-        @lc_apply = arg
-      else
-      @lc_apply
-      end
-    end
-
-    def lc_additional(arg=nil)
-      if arg != nil
-        @lc_additional = arg
-      else
-      @lc_additional
-      end
-    end
-
-    def lc_when(arg=nil)
-      if arg != nil
-        @lc_when = arg
-      else
-      @lc_when
-      end
-    end
-
-    def created_at(arg=nil)
-      if arg != nil
-        @created_at = arg
-      else
-      @created_at
-      end
-    end
-    def some_msg(arg=nil)
-      if arg != nil
-        @some_msg = arg
-      else
-      @some_msg
-      end
-    end
-
-    def error?
-      crocked  = true if (some_msg.has_key?(:msg_type) && some_msg[:msg_type] == "error")
-    end
-
-    # Transform the ruby obj ->  to a Hash
-    def to_hash
-      index_hash = Hash.new
-      index_hash["json_claz"] = self.class.name
-      index_hash["id"] = id
-      index_hash["req_type"] = req_type
-      index_hash["appdefns_id"] = appdefns_id
-      index_hash["node_name"] = node_name
-      index_hash["lc_apply"] = lc_apply
-      index_hash["lc_additional"] = lc_additional
-      index_hash["lc_when"] = lc_when
-      index_hash["created_at"] = created_at
-      index_hash["some_msg"] = some_msg
-      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
-
-    def for_json
-      result = {
-        "id" => id,
-        "req_type" => req_type,
-        "appdefns_id" => appdefns_id,
-        "node_name" => node_name,
-        "lc_apply" => lc_apply,
-        "lc_additional" => lc_additional,
-        "lc_when" => lc_when,
-        "created_at" => created_at
-      }
-      result
-    end
-
-
-    # Create a Megam::Node from NodeResult-JSON
-    #
-    #[{
-    #"id":"NOD362212018897289216",
-    #"accounts_id":"ACT362211962353876992",
-    #"json_claz":"Megam::Node",
-    #"request":{
-    #"req_id":"NOD362212018897289216",
-    #"command":"commands"
-    #},
-    #"predefs":{
-    #"name":"",
-    #"scm":"",
-    #"war":"",
-    #"db":"",
-    #"queue":""
-    #}
-    #}]
-    #
-    def self.json_create(o)
-      appreq = new
-      appreq.id(o["id"]) if o.has_key?("id")
-      appreq.req_type(o["req_type"]) if o.has_key?("req_type")
-      appreq.appdefns_id(o["appdefns_id"]) if o.has_key?("appdefns_id")
-      appreq.node_name(o["node_name"]) if o.has_key?("node_name")
-      appreq.lc_apply(o["lc_apply"]) if o.has_key?("lc_apply")
-      appreq.lc_additional(o["lc_additional"]) if o.has_key?("lc_additional")
-      appreq.lc_when(o["lc_when"]) if o.has_key?("lc_when")
-      appreq.created_at(o["created_at"]) if o.has_key?("created_at")
-
-      appreq.some_msg[:code] = o["code"] if o.has_key?("code")
-      appreq.some_msg[:msg_type] = o["msg_type"] if o.has_key?("msg_type")
-      appreq.some_msg[:msg]= o["msg"] if o.has_key?("msg")
-      appreq.some_msg[:links] = o["links"] if o.has_key?("links")
-
-      appreq
-    end
-
-    def self.from_hash(o)
-      appreq = self.new()
-      appreq.from_hash(o)
-      appreq
-    end
-
-    def from_hash(o)
-      @id        = o["id"] if o.has_key?("id")
-      @req_type        = o["req_type"] if o.has_key?("req_type")
-      @appdefns_id    = o["appdefns_id"] if o.has_key?("appdefns_id")
-      @node_name = o["node_name"] if o.has_key?("node_name")
-      @lc_apply   = o["lc_apply"] if o.has_key?("lc_apply")
-      @lc_additional   = o["lc_additional"] if o.has_key?("lc_additional")
-      @lc_when   = o["lc_when"] if o.has_key?("lc_when")
-      @created_at        = o["created_at"] if o.has_key?("created_at")
-      self
-    end
-
-    def self.create(o)
-      acct = from_hash(o)
-      acct.create
-    end
-
-    # Create the node via the REST API
-    def create
-      podnix_rest.post_appreq(to_hash)
-    end
-
-    # Load a account by email_p
-    def self.list(node_name)
-      appreq = self.new()
-      appreq.podnix_rest.get_appreq(node_name)
-      #self
-    end
-
-    def to_s
-      Podnix::Stuff.styled_hash(to_hash)
-    #"---> Megam::Account:[error=#{error?}]\n"+
-    end
-
-  end
-end