ogre 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a9a5ab2416254704942cda8f92d6ed8ca93aa8e
-  data.tar.gz: 81c7a7f5af5d918d9e8d42e42d9caa7302a322d6
+  metadata.gz: b9cbbdc06373a992abab8c292614bf91a563df8c
+  data.tar.gz: 054ba7f55cb4151cb43e7868087b3befab394b48
 SHA512:
-  metadata.gz: 4d76becd36eaf13a1c6c1ce22c2a5dfcf4720df00d23cc06023d4c4de084bdda0b216c8abfc144b29d210195e767d8cc28e21867a29f3c09b87167bc9eca2ffe
-  data.tar.gz: 46d5a13a8dc24a07fe22d0f33eff16fadfa91de54c91011f2c70337e871b7d30f7e9d793ae031a902d3ad6124053c4faec03db7d6cd18b34bb1acb60b98207f9
+  metadata.gz: 7d7d0f61c79c549adc1aac5ddb45fc9a6d673917c78ae03d69d5f16f380464f009cea8471a8f5e4e3ad990e9705d7281c87eca1c58026bef46b68232b13f8455
+  data.tar.gz: ea7fb48920315c981cd7c4c592c5275872f9d69280438793345d7c7487f13a74a3c47233eea07d9d6427195ce7c4e187218116fb93b3dcd08189707dcd3967e2

data/.rubocop.yml

@@ -14,3 +14,5 @@ Style/SpecialGlobalVars:
   Enabled: false
 Style/FileName:
   Enabled: false
+Style/GuardClause:
+  Enabled: false

data/.travis.yml

@@ -1,3 +1,3 @@
 language: ruby
 rvm:
-  - "2.1.4"
+  - "2.2"

data/README.md

@@ -1,10 +1,8 @@
-[![Stories in Ready](https://badge.waffle.io/activenetwork-automation/ogre.svg?label=ready&title=Ready)](http://waffle.io/activenetwork-automation/ogre)
-
-[![Build Status](https://travis-ci.org/activenetwork-automation/ogre.svg)](https://travis-ci.org/activenetwork-automation/ogre)
+[![Stories in Ready](https://badge.waffle.io/activenetwork-automation/ogre.svg?label=ready&title=Ready)](http://waffle.io/activenetwork-automation/ogre) [![Build Status](https://travis-ci.org/activenetwork-automation/ogre.svg)](https://travis-ci.org/activenetwork-automation/ogre)
 [![Coverage Status](https://coveralls.io/repos/activenetwork-automation/ogre/badge.svg)](https://coveralls.io/r/activenetwork-automation/ogre)
 [![Dependency Status](https://gemnasium.com/activenetwork-automation/ogre.svg)](https://gemnasium.com/activenetwork-automation/ogre)
 [![Inline docs](http://inch-ci.org/github/activenetwork-automation/ogre.png?branch=master)](http://inch-ci.org/github/activenetwork-automation/ogre)
-[![Gem Version](https://badge.fury.io/rb/ogre.svg)](http://badge.fury.io/rb/ogre)
+[![Gem Version](https://badge.fury.io/rb/ogre.svg)](http://badge.fury.io/rb/ogre) [![Code Climate](https://codeclimate.com/github/activenetwork-automation/ogre/badges/gpa.svg)](https://codeclimate.com/github/activenetwork-automation/ogre)
 
 # Ogre
 

data/lib/ogre/associate.rb

@@ -15,11 +15,11 @@ module Ogre
       begin
         # associate (invite) user
         request_body = { user: user }
-        response = chef_rest.post_rest "organizations/#{org}/association_requests", request_body
+        response = chef_rest.post "organizations/#{org}/association_requests", request_body
 
         # add (force) user to org
         association_id = response['uri'].split('/').last
-        chef_rest.put_rest "users/#{user}/association_requests/#{association_id}", response: 'accept'
+        chef_rest.put "users/#{user}/association_requests/#{association_id}", response: 'accept'
       rescue Net::HTTPServerException => e
         # already exists -- i will allow it
         if e.response.code == '409'
@@ -35,11 +35,11 @@ module Ogre
 
       # add user to group(s)
       groups.each do |groupname|
-        group = chef_rest.get_rest "organizations/#{org}/groups/#{groupname}"
+        group = chef_rest.get "organizations/#{org}/groups/#{groupname}"
         # check if user is in group
         unless group['actors'].include?(user)
           body_hash = {
-            groupname: "#{groupname}",
+            groupname: groupname.to_s,
             actors: {
               users: group['actors'].concat([user]),
               groups: group['groups']
@@ -47,7 +47,7 @@ module Ogre
           }
 
           # associate user
-          chef_rest.put_rest "organizations/#{org}/groups/#{groupname}", body_hash
+          chef_rest.put "organizations/#{org}/groups/#{groupname}", body_hash
           puts "Successfully added '#{user}' to '#{groupname}' in the #{org} org"
         end
         next

data/lib/ogre/base.rb

@@ -13,9 +13,9 @@ module Ogre
 
     # Parameters passed in from cli will take precedence
     def chef_rest
-      Chef::REST.new(options[:server_url] || Config.options[:server_url],
-                     options[:run_as] || Config.options[:run_as],
-                     options[:key_path] || Config.options[:key_path])
+      Chef::Config.node_name = options[:run_as] || Config.options[:run_as]
+      Chef::Config.client_key = options[:key_path] || Config.options[:key_path]
+      Chef::ServerAPI.new(options[:server_url] || Config.options[:server_url])
     end
   end
 end

data/lib/ogre/config.rb

@@ -4,11 +4,11 @@ require 'fileutils'
 # into an accessible object
 module Ogre
   # ogre home
-  OGRE_HOME = "#{ENV['HOME']}/.ogre"
+  OGRE_HOME = "#{ENV['HOME']}/.ogre".freeze
   # config path
-  CONFIG_PATH = "#{OGRE_HOME}/config.json"
+  CONFIG_PATH = "#{OGRE_HOME}/config.json".freeze
   # default chef policy repo
-  REPO_URL = 'https://github.com/activenetwork-automation/code_generator'
+  REPO_URL = 'https://github.com/activenetwork-automation/code_generator'.freeze
 
   # Static method to make config parameters available
   class Config

data/lib/ogre/messages.rb

@@ -2,95 +2,95 @@
 # string constants for interactive messages
 module Ogre
   # version
-  DESC_VERSION              = 'Display gem version'
+  DESC_VERSION              = 'Display gem version'.freeze
 
   # org create description
-  DESC_CREATE               = 'Create an organization in Chef'
+  DESC_CREATE               = 'Create an organization in Chef'.freeze
 
   # org delete description
-  DESC_DELETE               = 'Delete an organization in Chef'
+  DESC_DELETE               = 'Delete an organization in Chef'.freeze
 
   # org short name
-  DESC_ORG                  = 'Organization short name'
+  DESC_ORG                  = 'Organization short name'.freeze
 
   # org description
-  DESC_ORG_DESC             = 'Organization long name'
+  DESC_ORG_DESC             = 'Organization long name'.freeze
 
   # org list
-  DESC_ORG_LIST             = 'List organiations'
+  DESC_ORG_LIST             = 'List organiations'.freeze
 
   # org Show
-  DESC_ORG_SHOW             = 'Show organization details'
+  DESC_ORG_SHOW             = 'Show organization details'.freeze
 
   # user list
-  DESC_USER_LIST            = 'List users'
+  DESC_USER_LIST            = 'List users'.freeze
 
   # private key path
-  DESC_PRIVATE_KEY          = 'Path to private key file'
+  DESC_PRIVATE_KEY          = 'Path to private key file'.freeze
 
   # chef server url
-  DESC_CHEF_SERVER_URL      = 'Chef Server URL i.e. https://chef.server.domain'
+  DESC_CHEF_SERVER_URL      = 'Chef Server URL i.e. https://chef.server.domain'.freeze
 
   # associate description
-  DESC_ASSOCIATE_USERS      = 'Associate users to an organization'
+  DESC_ASSOCIATE_USERS      = 'Associate users to an organization'.freeze
 
   # user description
-  DESC_USER                 = 'User name'
+  DESC_USER                 = 'User name'.freeze
 
   # associate to admin group description
-  DESC_ASSOCIATE_ADMIN      = 'Add user to admin group within organization'
+  DESC_ASSOCIATE_ADMIN      = 'Add user to admin group within organization'.freeze
 
   # chef policy repository license
-  DESC_REPO_LICENSE         = 'Chef policy repository license'
+  DESC_REPO_LICENSE         = 'Chef policy repository license'.freeze
 
   # chef policy repository authors
-  DESC_REPO_AUTHORS         = 'Chef policy repository authors'
+  DESC_REPO_AUTHORS         = 'Chef policy repository authors'.freeze
 
   # chef policy repository path
-  DESC_REPO_PATH            = 'Chef policy repository path'
+  DESC_REPO_PATH            = 'Chef policy repository path'.freeze
 
   # chef policy repository e-mail
-  DESC_REPO_EMAIL           = 'Chef policy repository e-mail'
+  DESC_REPO_EMAIL           = 'Chef policy repository e-mail'.freeze
 
   # create Chef policy repository
-  DESC_CREATE_REPO          = 'Create Chef policy repository'
+  DESC_CREATE_REPO          = 'Create Chef policy repository'.freeze
 
   # delete without confirmation
-  DESC_FORCE                = 'Delete without confirmation'
+  DESC_FORCE                = 'Delete without confirmation'.freeze
 
   # create new chef user
-  DESC_CREATE_USER          = 'Create new chef user'
+  DESC_CREATE_USER          = 'Create new chef user'.freeze
 
   # Delete and disassociate chef user
-  DESC_DELETE_USER          = 'Delete and disassociate chef user'
+  DESC_DELETE_USER          = 'Delete and disassociate chef user'.freeze
 
   # chef run as user
-  DESC_RUN_AS               = 'Chef user'
+  DESC_RUN_AS               = 'Chef user'.freeze
 
   # vCenter Orchestrator URL
-  DESC_VCO_URL              = 'vCenter Orchestrator URL'
+  DESC_VCO_URL              = 'vCenter Orchestrator URL'.freeze
 
   # vCenter Orchestrator user
-  DESC_VCO_USER             = 'vCenter Orchestrator user'
+  DESC_VCO_USER             = 'vCenter Orchestrator user'.freeze
 
   # vCenter Orchestrator password
-  DESC_VCO_PASSWORD         = 'vCenter Orchestrator password'
+  DESC_VCO_PASSWORD         = 'vCenter Orchestrator password'.freeze
 
   # vCenter Orchestrator workflow name
-  DESC_VCO_WF_NAME          = 'vCenter Orchestrator workflow name'
+  DESC_VCO_WF_NAME          = 'vCenter Orchestrator workflow name'.freeze
 
   # Set chef validation key for VCO
-  DESC_SET_PRIVATE_KEY      = 'Set chef validation key for VCO'
+  DESC_SET_PRIVATE_KEY      = 'Set chef validation key for VCO'.freeze
 
   # Chef hostname
-  DESC_CHEF_HOSTNAME        = 'Chef hostname'
+  DESC_CHEF_HOSTNAME        = 'Chef hostname'.freeze
 
   # Chef validator username
-  DESC_CHEF_VALIDATOR       = 'Chef validator user name'
+  DESC_CHEF_VALIDATOR       = 'Chef validator user name'.freeze
 
   # vCenter verify ssl param
-  DESC_VCO_VERIFY_SSL       = 'vCenter Orchestrator verify ssl'
+  DESC_VCO_VERIFY_SSL       = 'vCenter Orchestrator verify ssl'.freeze
 
   # Chef Policy Repository skeleton url
-  DESC_REPO_URL             = 'Chef Policy Repository skeleton url'
+  DESC_REPO_URL             = 'Chef Policy Repository skeleton url'.freeze
 end

data/lib/ogre/org-create.rb

@@ -20,8 +20,8 @@ module Ogre
 
     # organization create method
     def org_create
-      org_json = { name: "#{org}", full_name: "#{org_desc}" }
-      response = chef_rest.post_rest('/organizations', org_json)
+      org_json = { name: org.to_s, full_name: org_desc.to_s }
+      response = chef_rest.post('/organizations', org_json)
       puts "'#{org}' org has been created."
 
       # use chef repo generate to create a chef policy repo
@@ -97,19 +97,19 @@ module Ogre
       # optional license
       if options[:license]
         generate_str << '-I'
-        generate_str << "#{options[:license]}"
+        generate_str << options[:license].to_s
       end
 
       # optional email
       if options[:email]
         generate_str << '-m'
-        generate_str << "#{options[:email]}"
+        generate_str << options[:email].to_s
       end
 
       # optional authors
       if options[:authors]
         generate_str << '-C'
-        generate_str << "#{options[:authors]}"
+        generate_str << options[:authors].to_s
       end
 
       generate_str

data/lib/ogre/org-delete.rb

@@ -14,7 +14,7 @@ module Ogre
       exit unless options[:force] || HighLine.agree("Deleting '#{org}' is permanent. Do you want to proceed? (y/n)")
 
       begin
-        chef_rest.delete_rest("/organizations/#{org}")
+        chef_rest.delete("/organizations/#{org}")
         puts "'#{org}' org has been deleted."
       rescue Net::HTTPServerException => e
         # does not exist, exit gracefully

data/lib/ogre/org-list.rb

@@ -6,7 +6,7 @@ module Ogre
     # Organizations list
     def org_list
       # pull down all orgs
-      results = chef_rest.get_rest('/organizations')
+      results = chef_rest.get('/organizations')
       puts results.keys.sort { |a, b| a <=> b }
     end
   end

data/lib/ogre/org-show.rb

@@ -9,16 +9,16 @@ module Ogre
     # Show org details
     def org_show
       # get org details
-      results = chef_rest.get_rest("/organizations/#{org}")
+      results = chef_rest.get("/organizations/#{org}")
       puts colorize('name:') + "         #{results['name']}"
       puts colorize('description:') + "  #{results['full_name']}"
       puts colorize('guid:') + "         #{results['guid']}"
 
       # get admins
-      admins = chef_rest.get_rest("/organizations/#{org}/groups/admins")
+      admins = chef_rest.get("/organizations/#{org}/groups/admins")
 
       # get normal users
-      users = chef_rest.get_rest("/organizations/#{org}/groups/users")
+      users = chef_rest.get("/organizations/#{org}/groups/users")
 
       # output admins with a '@' prefix
       admins['users'].each do |admin|

data/lib/ogre/set-private-key.rb

@@ -19,13 +19,13 @@ module Ogre
     # Execute vcoworkflows gem to call set private key
     def set_private_key
       # get workflow
-      # rubocop:disable AlignParameters, SpaceAroundOperators
+      # rubocop:disable AlignParameters
       workflow = VcoWorkflows::Workflow.new(options[:vco_wf_name]    || Config.options[:vco_wf_name],
                                 url:        options[:vco_url]        || Config.options[:vco_url],
                                 verify_ssl: options[:vco_verify_ssl] || Config.options[:vco_verify_ssl],
                                 username:   options[:vco_user]       || Config.options[:vco_user],
                                 password:   options[:vco_password]   || Config.options[:vco_password])
-      # rubocop:enable AlignParameters, SpaceAroundOperators
+      # rubocop:enable AlignParameters
 
       # set parameters
       workflow.parameter('chefHostname', chef_hostname)

data/lib/ogre/user-create.rb

@@ -22,7 +22,7 @@ module Ogre
         password:     password
       }
 
-      chef_rest.post_rest('/users', user_json)
+      chef_rest.post('/users', user_json)
 
       puts "'#{username}' has been created."
 

data/lib/ogre/user-delete.rb

@@ -17,14 +17,14 @@ module Ogre
       # rubocop:enable LineLength
 
       # disassociate from all orgs
-      orgs = chef_rest.get_rest("users/#{username}/organizations")
+      orgs = chef_rest.get("users/#{username}/organizations")
       org_names = orgs.map { |o| o['organization']['name'] }
       org_names.each do |org|
-        puts chef_rest.delete_rest("organizations/#{org}/users/#{username}")
+        puts chef_rest.delete("organizations/#{org}/users/#{username}")
       end
 
       # delete user
-      chef_rest.delete_rest("users/#{username}")
+      chef_rest.delete("users/#{username}")
       puts "'#{username}' has been deleted."
 
     rescue Net::HTTPServerException => e

data/lib/ogre/user-list.rb

@@ -6,7 +6,7 @@ module Ogre
     # Users list
     def org_list
       # pull down all users
-      results = chef_rest.get_rest('/users')
+      results = chef_rest.get('/users')
       puts results.keys.sort { |a, b| a <=> b }
     end
   end

data/lib/ogre/version.rb

@@ -1,5 +1,5 @@
 # simple gem version number tracking
 module Ogre
   # ogre version
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'.freeze
 end

data/spec/ogre/associate_spec.rb

@@ -9,8 +9,8 @@ VCR.configure do |config|
   config.before_record do |interaction|
     headers = interaction.request.headers
     headers.keys
-      .select { |k| k =~ /^X-Ops-(Authorization-|Content-Hash)/ }
-      .each { |header| headers[header] = Array("{{#{header}}}") }
+           .select { |k| k =~ /^X-Ops-(Authorization-|Content-Hash)/ }
+           .each { |header| headers[header] = Array("{{#{header}}}") }
     headers['X-Ops-Userid'] = 'pivotal'
   end
 end

data/spec/ogre/org-create_spec.rb

@@ -9,8 +9,8 @@ VCR.configure do |config|
   config.before_record do |interaction|
     headers = interaction.request.headers
     headers.keys
-      .select { |k| k =~ /^X-Ops-(Authorization-|Content-Hash)/ }
-      .each { |header| headers[header] = Array("{{#{header}}}") }
+           .select { |k| k =~ /^X-Ops-(Authorization-|Content-Hash)/ }
+           .each { |header| headers[header] = Array("{{#{header}}}") }
     headers['X-Ops-Userid'] = 'pivotal'
   end
 end

data/spec/ogre/org-delete_spec.rb

@@ -9,8 +9,8 @@ VCR.configure do |config|
   config.before_record do |interaction|
     headers = interaction.request.headers
     headers.keys
-      .select { |k| k =~ /^X-Ops-(Authorization-|Content-Hash)/ }
-      .each { |header| headers[header] = Array("{{#{header}}}") }
+           .select { |k| k =~ /^X-Ops-(Authorization-|Content-Hash)/ }
+           .each { |header| headers[header] = Array("{{#{header}}}") }
     headers['X-Ops-Userid'] = 'pivotal'
   end
 end

data/spec/ogre/org-list_spec.rb

@@ -9,8 +9,8 @@ VCR.configure do |config|
   config.before_record do |interaction|
     headers = interaction.request.headers
     headers.keys
-      .select { |k| k =~ /^X-Ops-(Authorization-|Content-Hash)/ }
-      .each { |header| headers[header] = Array("{{#{header}}}") }
+           .select { |k| k =~ /^X-Ops-(Authorization-|Content-Hash)/ }
+           .each { |header| headers[header] = Array("{{#{header}}}") }
     headers['X-Ops-Userid'] = 'pivotal'
   end
 end

data/spec/ogre/org-show_spec.rb

@@ -9,8 +9,8 @@ VCR.configure do |config|
   config.before_record do |interaction|
     headers = interaction.request.headers
     headers.keys
-      .select { |k| k =~ /^X-Ops-(Authorization-|Content-Hash)/ }
-      .each { |header| headers[header] = Array("{{#{header}}}") }
+           .select { |k| k =~ /^X-Ops-(Authorization-|Content-Hash)/ }
+           .each { |header| headers[header] = Array("{{#{header}}}") }
     headers['X-Ops-Userid'] = 'pivotal'
   end
 end

data/spec/ogre/user-create_spec.rb

@@ -9,8 +9,8 @@ VCR.configure do |config|
   config.before_record do |interaction|
     headers = interaction.request.headers
     headers.keys
-      .select { |k| k =~ /^X-Ops-(Authorization-|Content-Hash)/ }
-      .each { |header| headers[header] = Array("{{#{header}}}") }
+           .select { |k| k =~ /^X-Ops-(Authorization-|Content-Hash)/ }
+           .each { |header| headers[header] = Array("{{#{header}}}") }
     headers['X-Ops-Userid'] = 'pivotal'
   end
 end

data/spec/ogre/user-delete_spec.rb

@@ -9,8 +9,8 @@ VCR.configure do |config|
   config.before_record do |interaction|
     headers = interaction.request.headers
     headers.keys
-      .select { |k| k =~ /^X-Ops-(Authorization-|Content-Hash)/ }
-      .each { |header| headers[header] = Array("{{#{header}}}") }
+           .select { |k| k =~ /^X-Ops-(Authorization-|Content-Hash)/ }
+           .each { |header| headers[header] = Array("{{#{header}}}") }
     headers['X-Ops-Userid'] = 'pivotal'
   end
 end

data/spec/ogre/user-list_spec.rb

@@ -9,8 +9,8 @@ VCR.configure do |config|
   config.before_record do |interaction|
     headers = interaction.request.headers
     headers.keys
-      .select { |k| k =~ /^X-Ops-(Authorization-|Content-Hash)/ }
-      .each { |header| headers[header] = Array("{{#{header}}}") }
+           .select { |k| k =~ /^X-Ops-(Authorization-|Content-Hash)/ }
+           .each { |header| headers[header] = Array("{{#{header}}}") }
     headers['X-Ops-Userid'] = 'pivotal'
   end
 end

data/spec/spec_helper.rb

@@ -5,12 +5,12 @@ require 'vcr'
 
 DEFAULTS = %w(--run-as pivotal
               --key-path spec/fixtures/client_key/dummy.pem
-              --server-url https://chef.server)
+              --server-url https://chef.server).freeze
 VCO_DEFAULTS = %w(--vco-url https://vco.server:8281/
                   --vco-user user
                   --vco-password password
                   --vco-wf-name Set-Private-Key
-                  --vco-verify-ssl false)
-KNIFE_PATH = 'tmp/my-org-name-chef/.chef/knife.rb'
+                  --vco-verify-ssl false).freeze
+KNIFE_PATH = 'tmp/my-org-name-chef/.chef/knife.rb'.freeze
 
 Coveralls.wear!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ogre
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - "'Joe"
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-05 00:00:00.000000000 Z
+date: 2016-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -303,7 +303,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Automated generation of enterprise chef organizations