pe-razor-client 0.14.0 → 0.15.2

data/spec/spec_helper.rb

@@ -26,6 +26,12 @@ VCR.configure do |c|
     :record => vcr_record_mode
   }
 end
+def reset_db
+  razor_admin_path = ENV['razor-admin'] || 'bin/razor-admin'
+  db_environment = ENV['server-database-environment'] || 'development'
+  # The `cd` business is a workaround, since running `razor-admin` from a different directory currently fails.
+  system("cd ../razor-server && #{razor_admin_path} -e #{db_environment} reset-database")
+end
 
 # Record one cassette for each test
 RSpec.configure do |c|
@@ -33,4 +39,9 @@ RSpec.configure do |c|
   c.before(:each) do
     ENV::delete('RAZOR_API')
   end
-end
+  # Make tests have no side effects when [re-]recording.
+  if vcr_recording?
+    c.before(:all) { reset_db }
+    c.after(:each) { reset_db }
+  end
+end

data/spec/testing.md

@@ -0,0 +1,16 @@
+For developers:
+
+Client-side spec tests use a framework called VCR for testing the client independent of the server. VCR fakes the
+interactions from the server so the client can continue executing its code. It does this by copying the exact
+expected input, then replying with the response provided by the server when the test is executed in a "record" mode.
+
+When writing these tests, keep in mind that other developers may need to rerecord tests. This can occur if a
+request to the server is somehow different, or if the client needs to issue a new request to the server.
+
+Here are some suggestions to make rerecording easier:
+
+- If a request has external dependencies, set up the dependencies as part of (or before) the test.
+    - For example, let's say you're testing the `create-policy` command. Execution of that command requires several
+      objects be present in the database: brokers, repos, etc. The only way to issue the `create-policy` command
+      successfully on the client is to issue `create-broker`, `create-repo`, etc. beforehand. These extra commands
+      should be part of the test.

data/spec/version_spec.rb

@@ -0,0 +1,8 @@
+# -*- encoding: utf-8 -*-
+require_relative 'spec_helper'
+
+describe Razor::CLI::VERSION do
+  it "should not include a newline" do
+    described_class.should_not =~ /\n/
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pe-razor-client
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.2
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-27 00:00:00.000000000 Z
+date: 2014-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
@@ -42,16 +42,16 @@ dependencies:
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - <
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - <
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
@@ -66,71 +66,63 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-description: The client for the Razor server
-email:
-- info@puppetlabs.com
+description: |
+  Razor is an advanced provisioning application which can deploy both bare-metal
+  and virtual systems. It's aimed at solving the problem of how to bring new
+  metal into a state where your existing DevOps/configuration management
+  workflows can take it over.
+
+  This provides the client application gem, used to provide CLI access and control
+  to users of razor-server.
+email: info@puppetlabs.com
 executables:
 - razor
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .yardopts
-- Gemfile
-- Gemfile.lock
-- LICENSE
-- README.md
-- Rakefile
 - bin/razor
-- lib/razor.rb
 - lib/razor/cli.rb
+- lib/razor/cli/document.rb
 - lib/razor/cli/format.rb
 - lib/razor/cli/navigate.rb
-- lib/razor/cli/navigate.yaml
 - lib/razor/cli/parse.rb
-- pe-razor-client.gemspec
+- lib/razor/cli/transforms.rb
+- lib/razor/cli/version.rb
+- lib/razor/cli/views.rb
+- lib/razor/cli/views.yaml
+- lib/razor.rb
+- NEWS.md
+- README.md
+- LICENSE
+- spec/cli/format_spec.rb
 - spec/cli/navigate_spec.rb
 - spec/cli/parse_spec.rb
-- spec/fixtures/vcr/Razor_CLI_Navigate/with_a_single_item_path/.yml
-- spec/fixtures/vcr/Razor_CLI_Navigate/with_an_invalid_path/.yml
+- spec/fixtures/vcr/Razor_CLI_Navigate/argument_formatting/should_allow_spaces.yml
+- spec/fixtures/vcr/Razor_CLI_Navigate/for_command_help/should_provide_command_help_for_razor_--help_command_.yml
+- spec/fixtures/vcr/Razor_CLI_Navigate/for_command_help/should_provide_command_help_for_razor_-h_command_.yml
+- spec/fixtures/vcr/Razor_CLI_Navigate/for_command_help/should_provide_command_help_for_razor_command_--help_.yml
+- spec/fixtures/vcr/Razor_CLI_Navigate/for_command_help/should_provide_command_help_for_razor_command_-h_.yml
+- spec/fixtures/vcr/Razor_CLI_Navigate/for_command_help/should_provide_command_help_for_razor_command_help_.yml
+- spec/fixtures/vcr/Razor_CLI_Navigate/for_command_help/should_provide_command_help_for_razor_help_command_.yml
 - spec/fixtures/vcr/Razor_CLI_Navigate/with_authentication/should_preserve_that_across_navigation.yml
 - spec/fixtures/vcr/Razor_CLI_Navigate/with_authentication/should_supply_that_to_the_API_service.yml
-- spec/fixtures/vcr/Razor_CLI_Navigate/with_no_path/.yml
-- spec/fixtures/vcr/Razor_CLI_Parse/_new/_help/.yml
+- spec/fixtures/vcr/Razor_CLI_Navigate/with_invalid_parameter/should_fail_with_bad_JSON.yml
+- spec/fixtures/vcr/Razor_CLI_Navigate/with_invalid_parameter/should_fail_with_malformed_argument.yml
+- spec/fixtures/vcr/Razor_CLI_Navigate/with_multiple_arguments_with_same_name/combining_as_an_array/should_merge_an_array_into_an_existing_array.yml
+- spec/fixtures/vcr/Razor_CLI_Navigate/with_multiple_arguments_with_same_name/combining_as_an_array/should_merge_the_arguments_as_an_array.yml
+- spec/fixtures/vcr/Razor_CLI_Navigate/with_multiple_arguments_with_same_name/combining_as_an_array/should_merge_the_arguments_into_an_existing_array.yml
+- spec/fixtures/vcr/Razor_CLI_Navigate/with_multiple_arguments_with_same_name/combining_as_an_object/should_construct_a_json_object.yml
+- spec/fixtures/vcr/Razor_CLI_Navigate/with_multiple_arguments_with_same_name/combining_as_an_object/should_construct_a_json_object_with_unicode.yml
+- spec/fixtures/vcr/Razor_CLI_Navigate/with_multiple_arguments_with_same_name/combining_as_an_object/should_fail_with_mixed_types_array_then_hash_.yml
+- spec/fixtures/vcr/Razor_CLI_Navigate/with_multiple_arguments_with_same_name/combining_as_an_object/should_fail_with_mixed_types_hash_then_array_.yml
+- spec/fixtures/vcr/Razor_CLI_Navigate/with_no_parameters/should_fail_with_bad_JSON.yml
 - spec/fixtures/vcr/Razor_CLI_Parse/_new/_help/should_print_a_list_of_known_endpoints.yml
 - spec/spec_helper.rb
+- spec/testing.md
 - spec/vcr_library.rb
-homepage: https://github.com/puppetlabs/razor-client
-licenses:
-- ASL2
+- spec/version_spec.rb
+homepage: http://puppetlabs.com/puppet/puppet-enterprise
+licenses: []
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -151,17 +143,32 @@ rubyforge_project:
 rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
-summary: The client for everybody's favorite provisioning tool
+summary: Razor is an advanced provisioning application
 test_files:
+- spec/cli/format_spec.rb
 - spec/cli/navigate_spec.rb
 - spec/cli/parse_spec.rb
-- spec/fixtures/vcr/Razor_CLI_Navigate/with_a_single_item_path/.yml
-- spec/fixtures/vcr/Razor_CLI_Navigate/with_an_invalid_path/.yml
+- spec/fixtures/vcr/Razor_CLI_Navigate/argument_formatting/should_allow_spaces.yml
+- spec/fixtures/vcr/Razor_CLI_Navigate/for_command_help/should_provide_command_help_for_razor_--help_command_.yml
+- spec/fixtures/vcr/Razor_CLI_Navigate/for_command_help/should_provide_command_help_for_razor_-h_command_.yml
+- spec/fixtures/vcr/Razor_CLI_Navigate/for_command_help/should_provide_command_help_for_razor_command_--help_.yml
+- spec/fixtures/vcr/Razor_CLI_Navigate/for_command_help/should_provide_command_help_for_razor_command_-h_.yml
+- spec/fixtures/vcr/Razor_CLI_Navigate/for_command_help/should_provide_command_help_for_razor_command_help_.yml
+- spec/fixtures/vcr/Razor_CLI_Navigate/for_command_help/should_provide_command_help_for_razor_help_command_.yml
 - spec/fixtures/vcr/Razor_CLI_Navigate/with_authentication/should_preserve_that_across_navigation.yml
 - spec/fixtures/vcr/Razor_CLI_Navigate/with_authentication/should_supply_that_to_the_API_service.yml
-- spec/fixtures/vcr/Razor_CLI_Navigate/with_no_path/.yml
-- spec/fixtures/vcr/Razor_CLI_Parse/_new/_help/.yml
+- spec/fixtures/vcr/Razor_CLI_Navigate/with_invalid_parameter/should_fail_with_bad_JSON.yml
+- spec/fixtures/vcr/Razor_CLI_Navigate/with_invalid_parameter/should_fail_with_malformed_argument.yml
+- spec/fixtures/vcr/Razor_CLI_Navigate/with_multiple_arguments_with_same_name/combining_as_an_array/should_merge_an_array_into_an_existing_array.yml
+- spec/fixtures/vcr/Razor_CLI_Navigate/with_multiple_arguments_with_same_name/combining_as_an_array/should_merge_the_arguments_as_an_array.yml
+- spec/fixtures/vcr/Razor_CLI_Navigate/with_multiple_arguments_with_same_name/combining_as_an_array/should_merge_the_arguments_into_an_existing_array.yml
+- spec/fixtures/vcr/Razor_CLI_Navigate/with_multiple_arguments_with_same_name/combining_as_an_object/should_construct_a_json_object.yml
+- spec/fixtures/vcr/Razor_CLI_Navigate/with_multiple_arguments_with_same_name/combining_as_an_object/should_construct_a_json_object_with_unicode.yml
+- spec/fixtures/vcr/Razor_CLI_Navigate/with_multiple_arguments_with_same_name/combining_as_an_object/should_fail_with_mixed_types_array_then_hash_.yml
+- spec/fixtures/vcr/Razor_CLI_Navigate/with_multiple_arguments_with_same_name/combining_as_an_object/should_fail_with_mixed_types_hash_then_array_.yml
+- spec/fixtures/vcr/Razor_CLI_Navigate/with_no_parameters/should_fail_with_bad_JSON.yml
 - spec/fixtures/vcr/Razor_CLI_Parse/_new/_help/should_print_a_list_of_known_endpoints.yml
 - spec/spec_helper.rb
+- spec/testing.md
 - spec/vcr_library.rb
-has_rdoc: 
+- spec/version_spec.rb

data/.gitignore

@@ -1,7 +0,0 @@
-config.yaml
-log/*
-pkg/
-/.yardoc
-/Gemfile.local*
-/coverage
-/.project

data/.yardopts

@@ -1,2 +0,0 @@
---markup-provider=redcarpet
---markup=markdown

data/Gemfile

@@ -1,35 +0,0 @@
-source 'https://rubygems.org'
-
-# mime-types is a dependency of rest-client. We need to explicitly depend
-# on it and pin its version to make sure this works with Ruby 1.8.7
-gem 'mime-types', '< 2.0'
-gem 'rest-client'
-gem 'terminal-table'
-
-group :doc do
-  gem 'yard'
-  gem 'kramdown'
-end
-
-# This group will be excluded by default in `torquebox archive`
-group :test do
-  gem 'rack-test'
-  gem 'rspec', '~> 2.13.0'
-  gem 'rspec-core', '~> 2.13.1'
-  gem 'rspec-expectations', '~> 2.13.0'
-  gem 'rspec-mocks', '~> 2.13.1'
-  gem 'simplecov'
-  gem 'webmock'
-  gem 'vcr'
-end
-
-group :development do
-  gem 'rake'
-end
-
-# This allows you to create `Gemfile.local` and have it loaded automatically;
-# the purpose of this is to allow you to put additional development gems
-# somewhere convenient without having to constantly mess with this file.
-#
-# Gemfile.local is in the .gitignore file; do not check one in!
-eval(File.read(File.dirname(__FILE__) + '/Gemfile.local'), binding) rescue nil

data/Gemfile.lock

@@ -1,53 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    addressable (2.3.3)
-    crack (0.3.2)
-    diff-lcs (1.2.4)
-    kramdown (1.1.0)
-    mime-types (1.24)
-    multi_json (1.7.9)
-    rack (1.5.2)
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    rake (10.1.0)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
-    rspec (2.13.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    rspec-core (2.13.1)
-    rspec-expectations (2.13.0)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.1)
-    simplecov (0.7.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
-    terminal-table (1.4.5)
-    vcr (2.5.0)
-    webmock (1.9.3)
-      addressable (>= 2.2.7)
-      crack (>= 0.3.2)
-    yard (0.8.7)
-
-PLATFORMS
-  java
-  ruby
-
-DEPENDENCIES
-  kramdown
-  mime-types (< 2.0)
-  rack-test
-  rake
-  rest-client
-  rspec (~> 2.13.0)
-  rspec-core (~> 2.13.1)
-  rspec-expectations (~> 2.13.0)
-  rspec-mocks (~> 2.13.1)
-  simplecov
-  terminal-table
-  vcr
-  webmock
-  yard

data/Rakefile

@@ -1,37 +0,0 @@
-require 'rake'
-require "bundler/gem_tasks"
-
-# Needed to make the client work on Ruby 1.8.7
-unless Kernel.respond_to?(:require_relative)
-  module Kernel
-    def require_relative(path)
-      require File.join(File.dirname(caller[0]), path.to_str)
-    end
-  end
-end
-
-require_relative 'spec/vcr_library'
-
-namespace :bundler do
-  task :setup do
-    require 'bundler/setup'
-  end
-end
-
-namespace :spec do
-  require 'rspec/core'
-  require 'rspec/core/rake_task'
-
-  desc <<EOS
-Run all specs. Set VCR_RECORD to 'all' to rerecord and to 'new_episodes'
-to record new tests. Tapes are in #{VCR_LIBRARY}
-EOS
-  RSpec::Core::RakeTask.new(:all => :"bundler:setup") do |t|
-    t.pattern = 'spec/**/*_spec.rb'
-  end
-end
-
-desc "Erase all VCR recordings"
-task :"vcr:erase" do
-  erase_vcr_library
-end

data/lib/razor/cli/navigate.yaml

@@ -1,28 +0,0 @@
----
-
-# This file helps Razor::CLI::Navigate with a few things by annotating the
-# API. Ultimately, this should be something the server provides. But until
-# we better understand what sort of annotation we need from the server,
-# we'll keep this with the client.
-#
-# Possible argument types are
-#   - json: parse the argument value as a JSON document and use that
-#   - boolean: if the argument has no value associated with it, or the value
-#              is "true", convert to +true+; everything else gets converted
-#              to +false+
-commands:
-  create-broker:
-    args:
-      configuration: json
-  create-tag:
-    args:
-      rule: json
-  add-policy-tag:
-    args:
-      rule: json
-  update-tag-rule:
-    args:
-      rule: json
-  reboot-node:
-    args:
-      hard: boolean

data/pe-razor-client.gemspec

@@ -1,32 +0,0 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-
-Gem::Specification.new do |spec|
-  spec.name          = "pe-razor-client"
-  spec.version       = "0.14.0"
-  spec.authors       = ["Puppet Labs"]
-  spec.email         = ["info@puppetlabs.com"]
-  spec.description   = "The client for the Razor server"
-  spec.summary       = "The client for everybody's favorite provisioning tool"
-  spec.homepage      = "https://github.com/puppetlabs/razor-client"
-  spec.license       = "ASL2"
-
-  spec.files         = `git ls-files`.split($/)
-  spec.bindir        = "bin"
-  spec.executables   = ['razor']
-  spec.test_files    = spec.files.grep(%r{^spec/})
-  spec.require_paths = ["lib"]
-
-  spec.required_ruby_version
-
-  # mime-types is a dependency of rest-client. We need to explicitly depend
-  # on it and pin its version to make sure the gem works with Ruby 1.8.7
-  spec.add_dependency "mime-types", '< 2.0'
-  spec.add_dependency "multi_json"
-  spec.add_dependency "rest-client"
-  spec.add_dependency "terminal-table"
-
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
-end

data/spec/fixtures/vcr/Razor_CLI_Navigate/with_a_single_item_path/.yml

@@ -1,69 +0,0 @@
----
-http_interactions:
-- request:
-    method: get
-    uri: http://localhost:8080/api
-    body:
-      encoding: US-ASCII
-      string: ''
-    headers:
-      Accept:
-      - application/json
-      Accept-Encoding:
-      - gzip, deflate
-      User-Agent:
-      - Ruby
-  response:
-    status:
-      code: 200
-      message: OK
-    headers:
-      Server:
-      - Apache-Coyote/1.1
-      X-Content-Type-Options:
-      - nosniff
-      Content-Type:
-      - application/json;charset=utf-8
-      Content-Length:
-      - '1566'
-      Date:
-      - Wed, 28 Aug 2013 21:46:05 GMT
-    body:
-      encoding: US-ASCII
-      string: ! '{"commands":[{"name":"create-image","rel":"http://api.puppetlabs.com/razor/v1/commands/create-image","id":"http://localhost:8080/api/commands/create-image"},{"name":"delete-image","rel":"http://api.puppetlabs.com/razor/v1/commands/delete-image","id":"http://localhost:8080/api/commands/delete-image"},{"name":"create-installer","rel":"http://api.puppetlabs.com/razor/v1/commands/create-installer","id":"http://localhost:8080/api/commands/create-installer"},{"name":"create-tag","rel":"http://api.puppetlabs.com/razor/v1/commands/create-tag","id":"http://localhost:8080/api/commands/create-tag"},{"name":"create-broker","rel":"http://api.puppetlabs.com/razor/v1/commands/create-broker","id":"http://localhost:8080/api/commands/create-broker"},{"name":"create-policy","rel":"http://api.puppetlabs.com/razor/v1/commands/create-policy","id":"http://localhost:8080/api/commands/create-policy"}],"collections":[{"name":"brokers","rel":"http://api.puppetlabs.com/razor/v1/collections/brokers","id":"http://localhost:8080/api/collections/brokers"},{"name":"images","rel":"http://api.puppetlabs.com/razor/v1/collections/images","id":"http://localhost:8080/api/collections/images"},{"name":"tags","rel":"http://api.puppetlabs.com/razor/v1/collections/tags","id":"http://localhost:8080/api/collections/tags"},{"name":"policies","rel":"http://api.puppetlabs.com/razor/v1/collections/policies","id":"http://localhost:8080/api/collections/policies"},{"name":"nodes","rel":"http://api.puppetlabs.com/razor/v1/collections/nodes","id":"http://localhost:8080/api/collections/nodes"}]}'
-    http_version: 
-  recorded_at: Wed, 28 Aug 2013 21:46:05 GMT
-- request:
-    method: get
-    uri: http://localhost:8080/api/collections/tags
-    body:
-      encoding: US-ASCII
-      string: ''
-    headers:
-      Accept:
-      - application/json
-      Accept-Encoding:
-      - gzip, deflate
-      User-Agent:
-      - Ruby
-  response:
-    status:
-      code: 200
-      message: OK
-    headers:
-      Server:
-      - Apache-Coyote/1.1
-      X-Content-Type-Options:
-      - nosniff
-      Content-Type:
-      - application/json;charset=utf-8
-      Content-Length:
-      - '2'
-      Date:
-      - Wed, 28 Aug 2013 21:46:05 GMT
-    body:
-      encoding: US-ASCII
-      string: ! '[]'
-    http_version: 
-  recorded_at: Wed, 28 Aug 2013 21:46:05 GMT
-recorded_with: VCR 2.5.0