esod-client 0.2.0 → 0.2.1

data/.gitignore

@@ -0,0 +1 @@
+pkg/*

data/README

@@ -3,8 +3,11 @@ A simple tool to execute REST requests against an ESOD instance.
 
 == Examples ==
 Retrieving a resource as a Hash:
-  ./esod-client.rb -u http://elasticserver.com -r server -i 18779 -a c15052 -a asdfasdfasdf
+  ./esod-client.rb -u http://elasticserver.com -r server -i 18779 -a c15052
 
 Retrieving a property of a resource using dotted notation
   ./esod-client.rb -u http://localhost:3000 -r server -i 18779 -a c15052 -p "elastic_server.bundles.first.packages.first.display_name"
-  
+  
+Retrieving a custom resource path
+  ./esod-client.rb -u http://elasticserver.com -e api/admin/server/18779/iso -a c15052
+

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/command_line_options.rb

@@ -0,0 +1,19 @@
+$options = Trollop::options do
+  banner <<-EOS
+#{File.read('README')}
+Options:    
+  EOS
+  opt :url, "Base url of ESOD service", :required => true, :type => :string
+  opt :resource, "Resource to retrieve (ex: server)", :type => :string
+  opt :id, "Id of resource to retrieve (ex: 12345)", :type => :string
+  opt :resource_path, "Full resource path (instead of resource & id, ex: server/12345)", :type => :string
+  opt :property, "Property of the resource, dotted notation (ex: vm_configuration_parameters.first.name)", :type => :string, :required => false
+  opt :api_token, "User authentication token", :type => :string, :required => true
+end
+if $options[:resource] || $options[:id]
+  Trollop::die :resource_path, "cannot be specified if --resource and --id options are used. Use either --resource-path OR --resource and --id."
+elsif $options[:resource_path]
+  if $options[:resource] || $options[:id]
+    Trollop::die :resource, "cannot be specified if --resource-path option is used. Use either --resource-path OR --resource and --id."
+  end
+end

data/esod-client.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{esod-client}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Yan Pritzker", "CohesiveFT"]
@@ -17,12 +17,14 @@ Gem::Specification.new do |s|
      "README.ruby"
   ]
   s.files = [
-    "EXAMPLES",
+    ".gitignore",
+     "EXAMPLES",
      "GEM_RELEASE",
      "README",
      "README.ruby",
      "Rakefile",
      "VERSION",
+     "command_line_options.rb",
      "esod-client.gemspec",
      "esod-client.rb",
      "esodclient.rb",
@@ -100,8 +102,7 @@ Gem::Specification.new do |s|
      "lib/rest-client-1.2.0/spec/resource_spec.rb",
      "lib/rest-client-1.2.0/spec/response_spec.rb",
      "lib/rest-client-1.2.0/spec/restclient_spec.rb",
-     "lib/trollop.rb",
-     "pkg/esod-client-0.2.0.gem"
+     "lib/trollop.rb"
   ]
   s.homepage = %q{http://github.com/cohesive/esod-client}
   s.rdoc_options = ["--charset=UTF-8"]

data/esod-client.rb

@@ -3,23 +3,17 @@
 require 'lib/trollop'
 require 'pp'
 
-$options = Trollop::options do
-  banner <<-EOS
-#{File.read('README')}
-Options:    
-  EOS
-  opt :url, "Base url of ESOD service", :required => true, :type => :string
-  opt :resource, "Resource to retrieve (ex: server)", :type => :string, :required => true
-  opt :id, "Id of resource to retrieve (ex: 12345)", :type => :string, :required => true
-  opt :property, "Property of the resource, dotted notation (ex: vm_configuration_parameters.first.name)", :type => :string, :required => false
-  opt :api_token, "User authentication token", :type => :string, :required => true
-end
-
+require 'command_line_options'
 require 'esodclient'
 
 def main
   client = ESODClient.new($options[:url], $options[:api_token])
-  response = client.get($options[:resource], $options[:id])
+
+  response = if $options[:resource_path]
+    client.get_path($options[:resource_path])
+  else
+    client.get($options[:resource], $options[:id])
+  end
 
   if $options[:property]
     response = response.value_of_dotted_property($options[:property])

data/lib/esod_client/esod_client.rb

@@ -13,8 +13,6 @@ class ESODClient
     get_path("#{resource}/#{id}")
   end
   
-  protected
-  
   def get_path(path)
     response = RestClient.get("#{@url}/#{path}.xml?key=#{@token}").to_s
     response_hash = Hash.from_xml(response)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: esod-client
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Yan Pritzker
@@ -24,12 +24,14 @@ extra_rdoc_files:
 - README
 - README.ruby
 files: 
+- .gitignore
 - EXAMPLES
 - GEM_RELEASE
 - README
 - README.ruby
 - Rakefile
 - VERSION
+- command_line_options.rb
 - esod-client.gemspec
 - esod-client.rb
 - esodclient.rb
@@ -108,7 +110,6 @@ files:
 - lib/rest-client-1.2.0/spec/response_spec.rb
 - lib/rest-client-1.2.0/spec/restclient_spec.rb
 - lib/trollop.rb
-- pkg/esod-client-0.2.0.gem
 has_rdoc: true
 homepage: http://github.com/cohesive/esod-client
 licenses: []