onering-client 0.0.16 → 0.0.17

data/bin/onering

@@ -35,11 +35,12 @@ end
 subcommander.version = ::Gem.loaded_specs['onering-client'].version.to_s
 subcommander.desc    = ::Gem.loaded_specs['onering-client'].description
 
-#subcommander.opt :server, '-s', '--server', 'Specify the Onering server URL'
-
 subcommand :devices, "Operations related to Onering's assets database" do |devices|
   api = Onering::API::Devices
-  api.connect ENV['ONERING_URL']
+  api.connect({
+    :host    => ENV['ONERING_URL'],
+    :pemfile => ENV['ONERING_PEM']
+  })
 
   def _field(action, field, value, opts={})
     rv = []
@@ -137,7 +138,60 @@ subcommand :devices, "Operations related to Onering's assets database" do |devic
         begin
           json = ::JSON.load(STDIN.read)
           raise "Input document must specify an ID" if sc[:args].empty? and not json['id']
-          
+
+          print_format(api.save((sc[:args].first || json['id']), json))
+        rescue Exception => e
+          STDERR.puts "#{e.class.name}: #{e.message}"
+          exit 1
+        end
+      end
+    end
+  end
+end
+
+
+subcommand :users, "Manage Onering users" do |users|
+  api = Onering::API::Auth
+  api.connect({
+    :host    => ENV['ONERING_URL'],
+    :pemfile => ENV['ONERING_PEM']
+  })
+
+# SHOW
+  users.subcommand :show, "Print out a single user by ID" do |sc|
+    sc.usage = "onering users show ID"
+
+    sc.exec do
+      id = sc[:args].first
+      print_format(api.get(:users, id))
+    end
+  end
+
+# LIST
+  users.subcommand :list, "List users" do |sc|
+    sc.usage = "onering users list FIELD"
+    sc.opt :as_txt, '-t', '--as-text', "Return the results as text"
+
+    sc.exec do
+      field = sc[:args].first
+      filter = sc[:filter]
+
+      print_format(api.list(:users, field, {
+        :filter => filter
+      }), (sc[:as_txt] ? :text : nil))
+    end
+  end
+
+# SAVE
+  users.subcommand :save, "Creates or updates a new device in Onering, reading a JSON document from standard input" do |sc|
+    sc.usage = "cat user.json | onering users save [ID]"
+
+    sc.exec do
+      unless STDIN.tty?
+        begin
+          json = ::JSON.load(STDIN.read)
+          raise "Input document must specify an ID" if sc[:args].empty? and not json['id']
+
           print_format(api.save((sc[:args].first || json['id']), json))
         rescue Exception => e
           STDERR.puts "#{e.class.name}: #{e.message}"

data/lib/onering.rb

@@ -1,3 +1,4 @@
 $: << File.expand_path(File.dirname(__FILE__))
 require 'onering/api'
 require 'onering/plugins/devices'
+require 'onering/plugins/authentication'

data/lib/onering/api.rb

@@ -1,8 +1,9 @@
-require 'net/http'
+require 'net/https'
 require 'uri'
 require 'json'
 require 'yaml'
 require 'addressable/uri'
+require 'deep_merge'
 
 module Onering
   module API
@@ -13,29 +14,60 @@ module Onering
     end
 
     class Base
-      DEFAULT_BASE="http://onering"
+      DEFAULT_BASE="https://onering"
       DEFAULT_PATH="/api"
-      DEFAULT_OPTIONS={}
+      DEFAULT_OPTIONS_FILE=[
+        "./cli.yml",
+        "~/.onering/cli.yml",
+        "/etc/onering/cli.yml"
+      ]
+
+      DEFAULT_CLIENT_PEM=[
+        "./client.pem",
+        "~/.onering/client.pem",
+        "/etc/onering/client.pem"
+      ]
 
       class<<self
+        def connect(options={})
+        # list all existing config files from least specific to most
+          @_configfiles = ([options[:config]] + DEFAULT_OPTIONS_FILE).compact.select{|i|
+            File.exists?(File.expand_path(i))
+          }.reverse
+
+        # merge all config files with more-specific values overriding less-specific ones
+          @_config = {}
+          @_configfiles.each do |i|
+            c = YAML.load(File.read(File.expand_path(i))) rescue {}
+            @_config.deep_merge!(c)
+          end
 
-        def connect(host=nil)
-          if host.is_a?(URI)
-            @_uri = host
-          elsif host.is_a?(String)
-            @_uri = Addressable::URI.parse("#{host}/#{DEFAULT_PATH}")
+          if options[:host].is_a?(URI)
+            @_uri = options[:host]
+          elsif options[:host].is_a?(String)
+            @_uri = Addressable::URI.parse("#{options[:host]}/#{DEFAULT_PATH}")
           else
-            @_uri = Addressable::URI.parse("#{DEFAULT_BASE}/#{DEFAULT_PATH}")
+            @_uri = Addressable::URI.parse("#{@_config['url'] || DEFAULT_BASE}/#{@_config['apiroot'] || DEFAULT_PATH}")
           end
 
-
           if @_uri
-            @_http = Net::HTTP.new(@_uri.host, @_uri.port)
+            @_pemfile = ([options[:pemfile], @_config['pemfile']]+DEFAULT_CLIENT_PEM).compact.select{|i|
+              File.exists?(File.expand_path(i))
+            }.first
+
+            if @_pemfile
+              @_pem = File.read(File.expand_path(@_pemfile))
+              @_http = Net::HTTP.new(@_uri.host, (@_uri.port || 443))
+              @_http.use_ssl = true
+              @_http.cert = OpenSSL::X509::Certificate.new(@_pem)
+              @_http.key = OpenSSL::PKey::RSA.new(@_pem)
+              @_http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+            end
           end
         end
 
         def request(endpoint, options={})
-          options = DEFAULT_OPTIONS.merge(options)
+          options = @_config.merge(options)
           request = nil
 
           uri = Addressable::URI.parse("#{@_uri.to_s}/#{endpoint}")

data/lib/onering/plugins/authentication.rb

@@ -0,0 +1,39 @@
+
+module Onering
+  module API
+    class Auth < Base
+      class<<self
+        def _check_type(type)
+          raise "Invalid authentication module object '#{type}'" unless %w{
+            users groups capabilities
+          }.include?(type.to_s)
+        end
+
+        def get(type, id='current')
+          _check_type(type)
+          request("#{type}/#{id}")
+        end
+
+        def list(type, field='id', options={
+          :unique => true,
+          :sort   => true,
+          :filter => nil
+        })
+          _check_type(type)
+          rv = request("#{type}/list").collect{|i| i[field.to_s] }
+          rv = rv.uniq if options[:unique]
+          rv = rv.sort if options[:sort]
+          rv
+        end
+
+        def save(type, id, data)
+          _check_type(type)
+          request("#{type}/#{id}", {
+            :method => :post,
+            :data   => data
+          })
+        end
+      end
+    end
+  end
+end

data/lib/onering/plugins/devices.rb

@@ -3,10 +3,6 @@ module Onering
   module API
     class Devices < Base
       class<<self
-        def connect(host=nil)
-          super(host)
-        end
-
         def get(id)
           request("devices/#{id}")
         end

metadata

@@ -1,96 +1,83 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: onering-client
-version: !ruby/object:Gem::Version 
-  hash: 63
+version: !ruby/object:Gem::Version
+  version: 0.0.17
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 16
-  version: 0.0.16
 platform: ruby
-authors: 
+authors:
 - Gary Hetzel
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-01-29 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-01-29 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: subcommander
+  requirement: &22628180 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: *22628180
+- !ruby/object:Gem::Dependency
+  name: deep_merge
+  requirement: &22627760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: addressable
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *22627760
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: &22627280 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: *22627280
 description: A Ruby wrapper for Onering
 email: ghetzel@outbrain.com
-executables: 
+executables:
 - onering
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/onering.rb
 - lib/onering/api.rb
 - lib/onering/plugins/devices.rb
+- lib/onering/plugins/authentication.rb
 - bin/onering
 homepage: https://github.com/outbrain/onering-ruby
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Onering client API
 test_files: []
-
-has_rdoc: