razor-client 0.16.0 → 1.0.0

data/spec/cli/parse_spec.rb

@@ -19,7 +19,7 @@ describe Razor::CLI::Parse do
   describe "#new" do
     context "with no arguments" do
       it {parse.show_help?.should be true}
-      it {parse.verify_ssl?.should be true}
+      it {parse.verify_ssl?.should be false}
     end
 
     context "with a '-h'" do
@@ -54,6 +54,7 @@ describe Razor::CLI::Parse do
       it "should use the given URL" do
         url = 'http://razor.example.com:2150/path/to/api'
         parse('-u',url).api_url.to_s.should == url
+        parse('-u',url).verify_ssl?.should == true
       end
 
       it "should terminate with an error if an invalid URL is provided" do
@@ -61,7 +62,7 @@ describe Razor::CLI::Parse do
       end
 
       it "should terminate with an error if a URL without a protocol is provided" do
-        expect{parse('-u','localhost:8080/api')}.to raise_error(Razor::CLI::InvalidURIError)
+        expect{parse('-u','localhost:8151/api')}.to raise_error(Razor::CLI::InvalidURIError)
       end
     end
 
@@ -81,6 +82,10 @@ describe Razor::CLI::Parse do
       it {parse("--insecure").verify_ssl?.should be false}
     end
 
+    context "with '--version'" do
+      it {parse("--version").show_version?.should be true}
+    end
+
     context "with ENV RAZOR_API set" do
       it "should use the given URL" do
         url = 'http://razor.example.com:2150/env/path/to/api'
@@ -101,16 +106,30 @@ describe Razor::CLI::Parse do
       end
     end
 
+    context "with ENV RAZOR_CA_FILE set" do
+      after :each do
+        ENV::delete('RAZOR_CA_FILE')
+      end
+      it "should raise an error if the RAZOR_CA_FILE override is invalid" do
+        ENV['RAZOR_CA_FILE'] = '/does/not/exist'
+        expect{parse}.to raise_error(Razor::CLI::InvalidCAFileError,
+            "CA file '/does/not/exist' in ENV variable RAZOR_CA_FILE does not exist")
+      end
+    end
+
     describe "#help", :vcr do
       subject(:p) {parse}
       it { should respond_to :help}
 
-      it { p.help.should be_a String}
+      it { output, exitcode = p.help
+           output.should be_a String
+           exitcode.should == 0}
 
       it "should print a list of known endpoints" do
         p.navigate.should_receive(:collections).and_return([])
         p.navigate.should_receive(:commands).and_return([])
-        p.help
+        _, exitcode = p.help
+        exitcode.should == 0
       end
     end
   end

data/spec/fixtures/vcr/Razor_CLI_Navigate/argument_formatting/should_allow_in_string.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: http://localhost:8080/api
+    uri: http://localhost:8150/api
     body:
       encoding: US-ASCII
       string: ''
@@ -25,17 +25,17 @@ http_interactions:
       Content-Type:
       - application/json;charset=utf-8
       Content-Length:
-      - '4981'
+      - '5650'
       Date:
-      - Thu, 14 Aug 2014 21:10:25 GMT
+      - Mon, 09 Mar 2015 19:54:07 GMT
     body:
       encoding: US-ASCII
-      string: '{"commands":[{"name":"add-policy-tag","rel":"http://api.puppetlabs.com/razor/v1/commands/add-policy-tag","id":"http://localhost:8080/api/commands/add-policy-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"},{"name":"create-repo","rel":"http://api.puppetlabs.com/razor/v1/commands/create-repo","id":"http://localhost:8080/api/commands/create-repo"},{"name":"create-tag","rel":"http://api.puppetlabs.com/razor/v1/commands/create-tag","id":"http://localhost:8080/api/commands/create-tag"},{"name":"create-task","rel":"http://api.puppetlabs.com/razor/v1/commands/create-task","id":"http://localhost:8080/api/commands/create-task"},{"name":"delete-broker","rel":"http://api.puppetlabs.com/razor/v1/commands/delete-broker","id":"http://localhost:8080/api/commands/delete-broker"},{"name":"delete-node","rel":"http://api.puppetlabs.com/razor/v1/commands/delete-node","id":"http://localhost:8080/api/commands/delete-node"},{"name":"delete-policy","rel":"http://api.puppetlabs.com/razor/v1/commands/delete-policy","id":"http://localhost:8080/api/commands/delete-policy"},{"name":"delete-repo","rel":"http://api.puppetlabs.com/razor/v1/commands/delete-repo","id":"http://localhost:8080/api/commands/delete-repo"},{"name":"delete-tag","rel":"http://api.puppetlabs.com/razor/v1/commands/delete-tag","id":"http://localhost:8080/api/commands/delete-tag"},{"name":"disable-policy","rel":"http://api.puppetlabs.com/razor/v1/commands/disable-policy","id":"http://localhost:8080/api/commands/disable-policy"},{"name":"enable-policy","rel":"http://api.puppetlabs.com/razor/v1/commands/enable-policy","id":"http://localhost:8080/api/commands/enable-policy"},{"name":"modify-node-metadata","rel":"http://api.puppetlabs.com/razor/v1/commands/modify-node-metadata","id":"http://localhost:8080/api/commands/modify-node-metadata"},{"name":"modify-policy-max-count","rel":"http://api.puppetlabs.com/razor/v1/commands/modify-policy-max-count","id":"http://localhost:8080/api/commands/modify-policy-max-count"},{"name":"move-policy","rel":"http://api.puppetlabs.com/razor/v1/commands/move-policy","id":"http://localhost:8080/api/commands/move-policy"},{"name":"reboot-node","rel":"http://api.puppetlabs.com/razor/v1/commands/reboot-node","id":"http://localhost:8080/api/commands/reboot-node"},{"name":"register-node","rel":"http://api.puppetlabs.com/razor/v1/commands/register-node","id":"http://localhost:8080/api/commands/register-node"},{"name":"reinstall-node","rel":"http://api.puppetlabs.com/razor/v1/commands/reinstall-node","id":"http://localhost:8080/api/commands/reinstall-node"},{"name":"remove-node-metadata","rel":"http://api.puppetlabs.com/razor/v1/commands/remove-node-metadata","id":"http://localhost:8080/api/commands/remove-node-metadata"},{"name":"remove-policy-tag","rel":"http://api.puppetlabs.com/razor/v1/commands/remove-policy-tag","id":"http://localhost:8080/api/commands/remove-policy-tag"},{"name":"set-node-desired-power-state","rel":"http://api.puppetlabs.com/razor/v1/commands/set-node-desired-power-state","id":"http://localhost:8080/api/commands/set-node-desired-power-state"},{"name":"set-node-hw-info","rel":"http://api.puppetlabs.com/razor/v1/commands/set-node-hw-info","id":"http://localhost:8080/api/commands/set-node-hw-info"},{"name":"set-node-ipmi-credentials","rel":"http://api.puppetlabs.com/razor/v1/commands/set-node-ipmi-credentials","id":"http://localhost:8080/api/commands/set-node-ipmi-credentials"},{"name":"update-node-metadata","rel":"http://api.puppetlabs.com/razor/v1/commands/update-node-metadata","id":"http://localhost:8080/api/commands/update-node-metadata"},{"name":"update-tag-rule","rel":"http://api.puppetlabs.com/razor/v1/commands/update-tag-rule","id":"http://localhost:8080/api/commands/update-tag-rule"}],"collections":[{"name":"brokers","rel":"http://api.puppetlabs.com/razor/v1/collections/brokers","id":"http://localhost:8080/api/collections/brokers"},{"name":"repos","rel":"http://api.puppetlabs.com/razor/v1/collections/repos","id":"http://localhost:8080/api/collections/repos"},{"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"},{"name":"tasks","rel":"http://api.puppetlabs.com/razor/v1/collections/tasks","id":"http://localhost:8080/api/collections/tasks"},{"name":"commands","rel":"http://api.puppetlabs.com/razor/v1/collections/commands","id":"http://localhost:8080/api/collections/commands"}],"version":{"server":"v0.15.0-26-gfffaba4-dirty"}}'
+      string: '{"commands":[{"name":"add-policy-tag","rel":"http://api.puppetlabs.com/razor/v1/commands/add-policy-tag","id":"http://localhost:8150/api/commands/add-policy-tag"},{"name":"create-broker","rel":"http://api.puppetlabs.com/razor/v1/commands/create-broker","id":"http://localhost:8150/api/commands/create-broker"},{"name":"create-hook","rel":"http://api.puppetlabs.com/razor/v1/commands/create-hook","id":"http://localhost:8150/api/commands/create-hook"},{"name":"create-policy","rel":"http://api.puppetlabs.com/razor/v1/commands/create-policy","id":"http://localhost:8150/api/commands/create-policy"},{"name":"create-repo","rel":"http://api.puppetlabs.com/razor/v1/commands/create-repo","id":"http://localhost:8150/api/commands/create-repo"},{"name":"create-tag","rel":"http://api.puppetlabs.com/razor/v1/commands/create-tag","id":"http://localhost:8150/api/commands/create-tag"},{"name":"create-task","rel":"http://api.puppetlabs.com/razor/v1/commands/create-task","id":"http://localhost:8150/api/commands/create-task"},{"name":"delete-broker","rel":"http://api.puppetlabs.com/razor/v1/commands/delete-broker","id":"http://localhost:8150/api/commands/delete-broker"},{"name":"delete-hook","rel":"http://api.puppetlabs.com/razor/v1/commands/delete-hook","id":"http://localhost:8150/api/commands/delete-hook"},{"name":"delete-node","rel":"http://api.puppetlabs.com/razor/v1/commands/delete-node","id":"http://localhost:8150/api/commands/delete-node"},{"name":"delete-policy","rel":"http://api.puppetlabs.com/razor/v1/commands/delete-policy","id":"http://localhost:8150/api/commands/delete-policy"},{"name":"delete-repo","rel":"http://api.puppetlabs.com/razor/v1/commands/delete-repo","id":"http://localhost:8150/api/commands/delete-repo"},{"name":"delete-tag","rel":"http://api.puppetlabs.com/razor/v1/commands/delete-tag","id":"http://localhost:8150/api/commands/delete-tag"},{"name":"disable-policy","rel":"http://api.puppetlabs.com/razor/v1/commands/disable-policy","id":"http://localhost:8150/api/commands/disable-policy"},{"name":"enable-policy","rel":"http://api.puppetlabs.com/razor/v1/commands/enable-policy","id":"http://localhost:8150/api/commands/enable-policy"},{"name":"modify-node-metadata","rel":"http://api.puppetlabs.com/razor/v1/commands/modify-node-metadata","id":"http://localhost:8150/api/commands/modify-node-metadata"},{"name":"modify-policy-max-count","rel":"http://api.puppetlabs.com/razor/v1/commands/modify-policy-max-count","id":"http://localhost:8150/api/commands/modify-policy-max-count"},{"name":"move-policy","rel":"http://api.puppetlabs.com/razor/v1/commands/move-policy","id":"http://localhost:8150/api/commands/move-policy"},{"name":"reboot-node","rel":"http://api.puppetlabs.com/razor/v1/commands/reboot-node","id":"http://localhost:8150/api/commands/reboot-node"},{"name":"register-node","rel":"http://api.puppetlabs.com/razor/v1/commands/register-node","id":"http://localhost:8150/api/commands/register-node"},{"name":"reinstall-node","rel":"http://api.puppetlabs.com/razor/v1/commands/reinstall-node","id":"http://localhost:8150/api/commands/reinstall-node"},{"name":"remove-node-metadata","rel":"http://api.puppetlabs.com/razor/v1/commands/remove-node-metadata","id":"http://localhost:8150/api/commands/remove-node-metadata"},{"name":"remove-policy-tag","rel":"http://api.puppetlabs.com/razor/v1/commands/remove-policy-tag","id":"http://localhost:8150/api/commands/remove-policy-tag"},{"name":"set-node-desired-power-state","rel":"http://api.puppetlabs.com/razor/v1/commands/set-node-desired-power-state","id":"http://localhost:8150/api/commands/set-node-desired-power-state"},{"name":"set-node-hw-info","rel":"http://api.puppetlabs.com/razor/v1/commands/set-node-hw-info","id":"http://localhost:8150/api/commands/set-node-hw-info"},{"name":"set-node-ipmi-credentials","rel":"http://api.puppetlabs.com/razor/v1/commands/set-node-ipmi-credentials","id":"http://localhost:8150/api/commands/set-node-ipmi-credentials"},{"name":"update-node-metadata","rel":"http://api.puppetlabs.com/razor/v1/commands/update-node-metadata","id":"http://localhost:8150/api/commands/update-node-metadata"},{"name":"update-tag-rule","rel":"http://api.puppetlabs.com/razor/v1/commands/update-tag-rule","id":"http://localhost:8150/api/commands/update-tag-rule"}],"collections":[{"name":"brokers","rel":"http://api.puppetlabs.com/razor/v1/collections/brokers","id":"http://localhost:8150/api/collections/brokers"},{"name":"repos","rel":"http://api.puppetlabs.com/razor/v1/collections/repos","id":"http://localhost:8150/api/collections/repos"},{"name":"tags","rel":"http://api.puppetlabs.com/razor/v1/collections/tags","id":"http://localhost:8150/api/collections/tags"},{"name":"policies","rel":"http://api.puppetlabs.com/razor/v1/collections/policies","id":"http://localhost:8150/api/collections/policies"},{"name":"nodes","rel":"http://api.puppetlabs.com/razor/v1/collections/nodes","id":"http://localhost:8150/api/collections/nodes","params":{"start":{"type":"number"},"limit":{"type":"number"}}},{"name":"tasks","rel":"http://api.puppetlabs.com/razor/v1/collections/tasks","id":"http://localhost:8150/api/collections/tasks"},{"name":"commands","rel":"http://api.puppetlabs.com/razor/v1/collections/commands","id":"http://localhost:8150/api/collections/commands"},{"name":"events","rel":"http://api.puppetlabs.com/razor/v1/collections/events","id":"http://localhost:8150/api/collections/events","params":{"start":{"type":"number"},"limit":{"type":"number"}}},{"name":"hooks","rel":"http://api.puppetlabs.com/razor/v1/collections/hooks","id":"http://localhost:8150/api/collections/hooks"}],"version":{"server":"v0.16.1-18-gd3acc7a-dirty"}}'
     http_version:
-  recorded_at: Thu, 14 Aug 2014 21:10:25 GMT
+  recorded_at: Mon, 09 Mar 2015 19:54:07 GMT
 - request:
     method: get
-    uri: http://localhost:8080/api/commands/create-repo
+    uri: http://localhost:8150/api/commands/create-repo
     body:
       encoding: US-ASCII
       string: ''
@@ -54,21 +54,21 @@ http_interactions:
       Server:
       - Apache-Coyote/1.1
       Etag:
-      - '"server-version-v0.15.0-26-gfffaba4-dirty"'
+      - '"server-version-v0.16.1-18-gd3acc7a-dirty"'
       X-Content-Type-Options:
       - nosniff
       Content-Type:
       - application/json;charset=utf-8
       Content-Length:
-      - '3240'
+      - '7794'
       Date:
-      - Thu, 14 Aug 2014 21:10:25 GMT
+      - Mon, 09 Mar 2015 19:54:07 GMT
     body:
       encoding: US-ASCII
-      string: '{"name":"create-repo","help":{"full":"# SYNOPSIS\nCreate a new repository,
-        from an ISO image or a URL\n\n# DESCRIPTION\nCreate a new repository, which
-        can either contain the content to install a\nnode, or simply point to an existing
-        online repository by URL.\n\n# Access Control\n\nThis command''s access control
+      string: '{"name":"create-repo","help":{"summary":"Create a new repository, from
+        an ISO image or a URL","description":"Create a new repository, which can either
+        contain the content to install a\nnode, or simply point to an existing online
+        repository by URL.","schema":"# Access Control\n\nThis command''s access control
         pattern: `commands:create-repo:%{name}`\n\nWords surrounded by `%{...}` are
         substitutions from the input data: typically\nthe name of the object being
         modified, or some other critical detail, these\nallow roles to be granted
@@ -81,138 +81,45 @@ http_interactions:
         The name of the repository.\n   - This attribute is required.\n   - It must
         be of type string.\n   - It must be between 1 and 250 in length.\n\n * url\n   -
         The URL of the remote repository to use.\n   - It must be of type string.\n   -
-        If present, iso-url must not be present.\n   - It must be between 1 and 1000
-        in length.\n\n * iso-url\n   - The URL of the ISO image to download and unpack
-        to create the\n     repository.  This can be an HTTP or HTTPS URL, or it can
-        be a\n     file URL.\n     \n     In the latter case, the file path is interpreted
-        as a path on the\n     Razor server, rather than a path on the client.  This
-        requires that\n     you manually place the ISO image on the server before
-        invoking the\n     command.\n   - It must be of type string.\n   - If present,
-        url must not be present.\n   - It must be between 1 and 1000 in length.\n\n
-        * task\n   - The name of the task associated with this repository.  This is
-        used to\n     install nodes that match a policy using this repository; generally
-        it\n     should match the OS that the URL or ISO-URL attributes point to.\n   -
-        This attribute is required.\n   - It must be of type string.\n\n# EXAMPLES\n\n  Create
-        a repository from an ISO image, which will be downloaded and unpacked\n  by
-        the razor-server in the background:\n  \n      {\n        \"name\":    \"fedora19\",\n        \"iso-url\":
-        \"http://example.com/Fedora-19-x86_64-DVD.iso\"\n        \"task\":    \"fedora\"\n      }\n  \n  You
-        can also unpack an ISO image from a file *on the server*; this does not\n  upload
-        the file from the client:\n      {\n        \"name\":    \"fedora19\",\n        \"iso-url\":
-        \"file:///tmp/Fedora-19-x86_64-DVD.iso\"\n        \"task\":    \"fedora\"\n      }\n  \n  Finally,
-        you can provide a `url` property when you create the repository;\n  this form
-        is merely a pointer to a resource somewhere and nothing will be\n  downloaded
-        onto the Razor server:\n  \n      {\n        \"name\": \"fedora19\",\n        \"url\":  \"http://mirrors.n-ix.net/fedora/linux/releases/19/Fedora/x86_64/os/\"\n        \"task\":
-        \"fedora\"\n      }\n"},"schema":{"name":{"type":"string"},"url":{"type":"string"},"iso-url":{"type":"string"},"task":{"type":"string"}}}'
-    http_version:
-  recorded_at: Thu, 14 Aug 2014 21:10:25 GMT
-- request:
-    method: get
-    uri: http://localhost:8080/api/commands/create-repo
-    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
-      Etag:
-      - '"server-version-v0.15.0-26-gfffaba4-dirty"'
-      X-Content-Type-Options:
-      - nosniff
-      Content-Type:
-      - application/json;charset=utf-8
-      Content-Length:
-      - '3240'
-      Date:
-      - Thu, 14 Aug 2014 21:10:25 GMT
-    body:
-      encoding: US-ASCII
-      string: '{"name":"create-repo","help":{"full":"# SYNOPSIS\nCreate a new repository,
-        from an ISO image or a URL\n\n# DESCRIPTION\nCreate a new repository, which
-        can either contain the content to install a\nnode, or simply point to an existing
-        online repository by URL.\n\n# Access Control\n\nThis command''s access control
-        pattern: `commands:create-repo:%{name}`\n\nWords surrounded by `%{...}` are
-        substitutions from the input data: typically\nthe name of the object being
-        modified, or some other critical detail, these\nallow roles to be granted
-        partial access to modify the system.\n\nFor more detail on how the permission
-        strings are structured and work, you can\nsee the [Shiro Permissions documentation][shiro].  That
-        pattern is expanded\nand then a permission check applied to it, before the
-        command is authorized.\n\nThese checks only apply if security is enabled in
-        the Razor configuration\nfile; on this server security is currently disabled.\n\n[shiro]:
-        http://shiro.apache.org/permissions.html\n\n# Attributes\n\n * name\n   -
-        The name of the repository.\n   - This attribute is required.\n   - It must
-        be of type string.\n   - It must be between 1 and 250 in length.\n\n * url\n   -
-        The URL of the remote repository to use.\n   - It must be of type string.\n   -
-        If present, iso-url must not be present.\n   - It must be between 1 and 1000
-        in length.\n\n * iso-url\n   - The URL of the ISO image to download and unpack
-        to create the\n     repository.  This can be an HTTP or HTTPS URL, or it can
-        be a\n     file URL.\n     \n     In the latter case, the file path is interpreted
-        as a path on the\n     Razor server, rather than a path on the client.  This
-        requires that\n     you manually place the ISO image on the server before
-        invoking the\n     command.\n   - It must be of type string.\n   - If present,
-        url must not be present.\n   - It must be between 1 and 1000 in length.\n\n
-        * task\n   - The name of the task associated with this repository.  This is
-        used to\n     install nodes that match a policy using this repository; generally
-        it\n     should match the OS that the URL or ISO-URL attributes point to.\n   -
-        This attribute is required.\n   - It must be of type string.\n\n# EXAMPLES\n\n  Create
-        a repository from an ISO image, which will be downloaded and unpacked\n  by
-        the razor-server in the background:\n  \n      {\n        \"name\":    \"fedora19\",\n        \"iso-url\":
-        \"http://example.com/Fedora-19-x86_64-DVD.iso\"\n        \"task\":    \"fedora\"\n      }\n  \n  You
-        can also unpack an ISO image from a file *on the server*; this does not\n  upload
-        the file from the client:\n      {\n        \"name\":    \"fedora19\",\n        \"iso-url\":
-        \"file:///tmp/Fedora-19-x86_64-DVD.iso\"\n        \"task\":    \"fedora\"\n      }\n  \n  Finally,
-        you can provide a `url` property when you create the repository;\n  this form
-        is merely a pointer to a resource somewhere and nothing will be\n  downloaded
-        onto the Razor server:\n  \n      {\n        \"name\": \"fedora19\",\n        \"url\":  \"http://mirrors.n-ix.net/fedora/linux/releases/19/Fedora/x86_64/os/\"\n        \"task\":
-        \"fedora\"\n      }\n"},"schema":{"name":{"type":"string"},"url":{"type":"string"},"iso-url":{"type":"string"},"task":{"type":"string"}}}'
-    http_version:
-  recorded_at: Thu, 14 Aug 2014 21:10:25 GMT
-- request:
-    method: get
-    uri: http://localhost:8080/api/commands/create-repo
-    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
-      Etag:
-      - '"server-version-v0.15.0-26-gfffaba4-dirty"'
-      X-Content-Type-Options:
-      - nosniff
-      Content-Type:
-      - application/json;charset=utf-8
-      Content-Length:
-      - '3240'
-      Date:
-      - Thu, 14 Aug 2014 21:10:25 GMT
-    body:
-      encoding: US-ASCII
-      string: '{"name":"create-repo","help":{"full":"# SYNOPSIS\nCreate a new repository,
-        from an ISO image or a URL\n\n# DESCRIPTION\nCreate a new repository, which
-        can either contain the content to install a\nnode, or simply point to an existing
-        online repository by URL.\n\n# Access Control\n\nThis command''s access control
+        If present, iso_url, no_content must not be present.\n   - It must be between
+        1 and 1000 in length.\n\n * iso_url\n   - The URL of the ISO image to download
+        and unpack to create the\n     repository.  This can be an HTTP or HTTPS URL,
+        or it can be a\n     file URL.\n     \n     In the latter case, the file path
+        is interpreted as a path on the\n     Razor server, rather than a path on
+        the client.  This requires that\n     you manually place the ISO image on
+        the server before invoking the\n     command.\n   - It must be of type string.\n   -
+        If present, url, no_content must not be present.\n   - It must be between
+        1 and 1000 in length.\n\n * no_content\n   - For cases where extraction will
+        be done manually, this argument\n     creates a stub directory in the repo
+        store where the extracted\n     contents can be placed.\n   - It must be of
+        type boolean.\n   - If present, iso_url, url must not be present.\n\n * task\n   -
+        The name of the task associated with this repository.  This is used to\n     install
+        nodes that match a policy using this repository; generally it\n     should
+        match the OS that the URL or ISO_URL attributes point to.\n   - This attribute
+        is required.\n   - It must be of type string.\n","examples":{"api":"Create
+        a repository from an ISO image, which will be downloaded and unpacked\nby
+        the razor-server in the background:\n\n    {\n      \"name\":    \"fedora19\",\n      \"iso_url\":
+        \"http://example.com/Fedora-19-x86_64-DVD.iso\"\n      \"task\":    \"fedora\"\n    }\n\nYou
+        can also unpack an ISO image from a file *on the server*; this does not\nupload
+        the file from the client:\n    {\n      \"name\":    \"fedora19\",\n      \"iso_url\":
+        \"file:///tmp/Fedora-19-x86_64-DVD.iso\"\n      \"task\":    \"fedora\"\n    }\n\nFinally,
+        you can provide a `url` property when you create the repository;\nthis form
+        is merely a pointer to a resource somewhere and nothing will be\ndownloaded
+        onto the Razor server:\n\n    {\n      \"name\": \"fedora19\",\n      \"url\":  \"http://mirrors.n-ix.net/fedora/linux/releases/19/Fedora/x86_64/os/\"\n      \"task\":
+        \"fedora\"\n    }","cli":"Create a repository from an ISO image, which will
+        be downloaded and unpacked\nby the razor-server in the background:\n\n    razor
+        create-repo --name fedora19 \\\n        --iso-url http://example.com/Fedora-19-x86_64-DVD.iso
+        \\\n        --task fedora\n\nYou can also unpack an ISO image from a file
+        *on the server*; this does not\nupload the file from the client:\n\n    razor
+        create-repo --name fedora19 \\\n        --iso-url file:///tmp/Fedora-19-x86_64-DVD.iso
+        \\\n        --task fedora\n\nFinally, you can provide a `url` property when
+        you create the repository;\nthis form is merely a pointer to a resource somewhere
+        and nothing will be\ndownloaded onto the Razor server:\n\n    razor create-repo
+        --name fedora19 --iso-url \\\n        http://mirrors.n-ix.net/fedora/linux/releases/19/Fedora/x86_64/os/
+        \\\n        --task fedora"},"full":"# SYNOPSIS\nCreate a new repository, from
+        an ISO image or a URL\n\n# DESCRIPTION\nCreate a new repository, which can
+        either contain the content to install a\nnode, or simply point to an existing
+        online repository by URL.\n# Access Control\n\nThis command''s access control
         pattern: `commands:create-repo:%{name}`\n\nWords surrounded by `%{...}` are
         substitutions from the input data: typically\nthe name of the object being
         modified, or some other critical detail, these\nallow roles to be granted
@@ -225,33 +132,37 @@ http_interactions:
         The name of the repository.\n   - This attribute is required.\n   - It must
         be of type string.\n   - It must be between 1 and 250 in length.\n\n * url\n   -
         The URL of the remote repository to use.\n   - It must be of type string.\n   -
-        If present, iso-url must not be present.\n   - It must be between 1 and 1000
-        in length.\n\n * iso-url\n   - The URL of the ISO image to download and unpack
-        to create the\n     repository.  This can be an HTTP or HTTPS URL, or it can
-        be a\n     file URL.\n     \n     In the latter case, the file path is interpreted
-        as a path on the\n     Razor server, rather than a path on the client.  This
-        requires that\n     you manually place the ISO image on the server before
-        invoking the\n     command.\n   - It must be of type string.\n   - If present,
-        url must not be present.\n   - It must be between 1 and 1000 in length.\n\n
-        * task\n   - The name of the task associated with this repository.  This is
-        used to\n     install nodes that match a policy using this repository; generally
-        it\n     should match the OS that the URL or ISO-URL attributes point to.\n   -
-        This attribute is required.\n   - It must be of type string.\n\n# EXAMPLES\n\n  Create
-        a repository from an ISO image, which will be downloaded and unpacked\n  by
-        the razor-server in the background:\n  \n      {\n        \"name\":    \"fedora19\",\n        \"iso-url\":
+        If present, iso_url, no_content must not be present.\n   - It must be between
+        1 and 1000 in length.\n\n * iso_url\n   - The URL of the ISO image to download
+        and unpack to create the\n     repository.  This can be an HTTP or HTTPS URL,
+        or it can be a\n     file URL.\n     \n     In the latter case, the file path
+        is interpreted as a path on the\n     Razor server, rather than a path on
+        the client.  This requires that\n     you manually place the ISO image on
+        the server before invoking the\n     command.\n   - It must be of type string.\n   -
+        If present, url, no_content must not be present.\n   - It must be between
+        1 and 1000 in length.\n\n * no_content\n   - For cases where extraction will
+        be done manually, this argument\n     creates a stub directory in the repo
+        store where the extracted\n     contents can be placed.\n   - It must be of
+        type boolean.\n   - If present, iso_url, url must not be present.\n\n * task\n   -
+        The name of the task associated with this repository.  This is used to\n     install
+        nodes that match a policy using this repository; generally it\n     should
+        match the OS that the URL or ISO_URL attributes point to.\n   - This attribute
+        is required.\n   - It must be of type string.\n\n# EXAMPLES\n\n  Create a
+        repository from an ISO image, which will be downloaded and unpacked\n  by
+        the razor-server in the background:\n  \n      {\n        \"name\":    \"fedora19\",\n        \"iso_url\":
         \"http://example.com/Fedora-19-x86_64-DVD.iso\"\n        \"task\":    \"fedora\"\n      }\n  \n  You
         can also unpack an ISO image from a file *on the server*; this does not\n  upload
-        the file from the client:\n      {\n        \"name\":    \"fedora19\",\n        \"iso-url\":
+        the file from the client:\n      {\n        \"name\":    \"fedora19\",\n        \"iso_url\":
         \"file:///tmp/Fedora-19-x86_64-DVD.iso\"\n        \"task\":    \"fedora\"\n      }\n  \n  Finally,
         you can provide a `url` property when you create the repository;\n  this form
         is merely a pointer to a resource somewhere and nothing will be\n  downloaded
         onto the Razor server:\n  \n      {\n        \"name\": \"fedora19\",\n        \"url\":  \"http://mirrors.n-ix.net/fedora/linux/releases/19/Fedora/x86_64/os/\"\n        \"task\":
-        \"fedora\"\n      }\n"},"schema":{"name":{"type":"string"},"url":{"type":"string"},"iso-url":{"type":"string"},"task":{"type":"string"}}}'
+        \"fedora\"\n      }\n"},"schema":{"name":{"type":"string"},"url":{"type":"string"},"iso_url":{"type":"string","aliases":["iso-url"]},"no_content":{"type":"boolean","aliases":["no-content"]},"task":{"type":"string"}}}'
     http_version:
-  recorded_at: Thu, 14 Aug 2014 21:10:26 GMT
+  recorded_at: Mon, 09 Mar 2015 19:54:07 GMT
 - request:
     method: post
-    uri: http://localhost:8080/api/commands/create-repo
+    uri: http://localhost:8150/api/commands/create-repo
     body:
       encoding: UTF-8
       string: '{"name":"''with=equals''","url":"http://url.com/some.iso","task":"noop"}'
@@ -280,15 +191,15 @@ http_interactions:
       Content-Length:
       - '219'
       Date:
-      - Thu, 14 Aug 2014 21:10:25 GMT
+      - Mon, 09 Mar 2015 19:54:07 GMT
     body:
       encoding: US-ASCII
-      string: '{"spec":"http://api.puppetlabs.com/razor/v1/collections/repos/member","id":"http://localhost:8080/api/collections/repos/''with=equals''","name":"''with=equals''","command":"http://localhost:8080/api/collections/commands/1"}'
+      string: '{"spec":"http://api.puppetlabs.com/razor/v1/collections/repos/member","id":"http://localhost:8150/api/collections/repos/''with=equals''","name":"''with=equals''","command":"http://localhost:8150/api/collections/commands/1"}'
     http_version:
-  recorded_at: Thu, 14 Aug 2014 21:10:26 GMT
+  recorded_at: Mon, 09 Mar 2015 19:54:07 GMT
 - request:
     method: get
-    uri: http://localhost:8080/api/collections/repos/'with=equals'
+    uri: http://localhost:8150/api/collections/repos/'with=equals'
     body:
       encoding: US-ASCII
       string: ''
@@ -313,10 +224,10 @@ http_interactions:
       Content-Length:
       - '353'
       Date:
-      - Thu, 14 Aug 2014 21:10:25 GMT
+      - Mon, 09 Mar 2015 19:54:07 GMT
     body:
       encoding: US-ASCII
-      string: '{"spec":"http://api.puppetlabs.com/razor/v1/collections/repos/member","id":"http://localhost:8080/api/collections/repos/''with=equals''","name":"''with=equals''","iso_url":null,"url":"http://url.com/some.iso","task":{"spec":"http://api.puppetlabs.com/razor/v1/collections/tasks/member","id":"http://localhost:8080/api/collections/tasks/noop","name":"noop"}}'
+      string: '{"spec":"http://api.puppetlabs.com/razor/v1/collections/repos/member","id":"http://localhost:8150/api/collections/repos/''with=equals''","name":"''with=equals''","iso_url":null,"url":"http://url.com/some.iso","task":{"spec":"http://api.puppetlabs.com/razor/v1/collections/tasks/member","id":"http://localhost:8150/api/collections/tasks/noop","name":"noop"}}'
     http_version:
-  recorded_at: Thu, 14 Aug 2014 21:10:26 GMT
-recorded_with: VCR 2.9.2
+  recorded_at: Mon, 09 Mar 2015 19:54:07 GMT
+recorded_with: VCR 2.5.0

data/spec/fixtures/vcr/Razor_CLI_Navigate/argument_formatting/should_allow_spaces.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: http://localhost:8080/api
+    uri: http://localhost:8150/api
     body:
       encoding: US-ASCII
       string: ''
@@ -25,17 +25,17 @@ http_interactions:
       Content-Type:
       - application/json;charset=utf-8
       Content-Length:
-      - '4982'
+      - '5650'
       Date:
-      - Wed, 21 May 2014 21:40:46 GMT
+      - Mon, 09 Mar 2015 19:54:01 GMT
     body:
       encoding: US-ASCII
-      string: '{"commands":[{"name":"add-policy-tag","rel":"http://api.puppetlabs.com/razor/v1/commands/add-policy-tag","id":"http://localhost:8080/api/commands/add-policy-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"},{"name":"create-repo","rel":"http://api.puppetlabs.com/razor/v1/commands/create-repo","id":"http://localhost:8080/api/commands/create-repo"},{"name":"create-tag","rel":"http://api.puppetlabs.com/razor/v1/commands/create-tag","id":"http://localhost:8080/api/commands/create-tag"},{"name":"create-task","rel":"http://api.puppetlabs.com/razor/v1/commands/create-task","id":"http://localhost:8080/api/commands/create-task"},{"name":"delete-broker","rel":"http://api.puppetlabs.com/razor/v1/commands/delete-broker","id":"http://localhost:8080/api/commands/delete-broker"},{"name":"delete-node","rel":"http://api.puppetlabs.com/razor/v1/commands/delete-node","id":"http://localhost:8080/api/commands/delete-node"},{"name":"delete-policy","rel":"http://api.puppetlabs.com/razor/v1/commands/delete-policy","id":"http://localhost:8080/api/commands/delete-policy"},{"name":"delete-repo","rel":"http://api.puppetlabs.com/razor/v1/commands/delete-repo","id":"http://localhost:8080/api/commands/delete-repo"},{"name":"delete-tag","rel":"http://api.puppetlabs.com/razor/v1/commands/delete-tag","id":"http://localhost:8080/api/commands/delete-tag"},{"name":"disable-policy","rel":"http://api.puppetlabs.com/razor/v1/commands/disable-policy","id":"http://localhost:8080/api/commands/disable-policy"},{"name":"enable-policy","rel":"http://api.puppetlabs.com/razor/v1/commands/enable-policy","id":"http://localhost:8080/api/commands/enable-policy"},{"name":"modify-node-metadata","rel":"http://api.puppetlabs.com/razor/v1/commands/modify-node-metadata","id":"http://localhost:8080/api/commands/modify-node-metadata"},{"name":"modify-policy-max-count","rel":"http://api.puppetlabs.com/razor/v1/commands/modify-policy-max-count","id":"http://localhost:8080/api/commands/modify-policy-max-count"},{"name":"move-policy","rel":"http://api.puppetlabs.com/razor/v1/commands/move-policy","id":"http://localhost:8080/api/commands/move-policy"},{"name":"reboot-node","rel":"http://api.puppetlabs.com/razor/v1/commands/reboot-node","id":"http://localhost:8080/api/commands/reboot-node"},{"name":"register-node","rel":"http://api.puppetlabs.com/razor/v1/commands/register-node","id":"http://localhost:8080/api/commands/register-node"},{"name":"reinstall-node","rel":"http://api.puppetlabs.com/razor/v1/commands/reinstall-node","id":"http://localhost:8080/api/commands/reinstall-node"},{"name":"remove-node-metadata","rel":"http://api.puppetlabs.com/razor/v1/commands/remove-node-metadata","id":"http://localhost:8080/api/commands/remove-node-metadata"},{"name":"remove-policy-tag","rel":"http://api.puppetlabs.com/razor/v1/commands/remove-policy-tag","id":"http://localhost:8080/api/commands/remove-policy-tag"},{"name":"set-node-desired-power-state","rel":"http://api.puppetlabs.com/razor/v1/commands/set-node-desired-power-state","id":"http://localhost:8080/api/commands/set-node-desired-power-state"},{"name":"set-node-hw-info","rel":"http://api.puppetlabs.com/razor/v1/commands/set-node-hw-info","id":"http://localhost:8080/api/commands/set-node-hw-info"},{"name":"set-node-ipmi-credentials","rel":"http://api.puppetlabs.com/razor/v1/commands/set-node-ipmi-credentials","id":"http://localhost:8080/api/commands/set-node-ipmi-credentials"},{"name":"update-node-metadata","rel":"http://api.puppetlabs.com/razor/v1/commands/update-node-metadata","id":"http://localhost:8080/api/commands/update-node-metadata"},{"name":"update-tag-rule","rel":"http://api.puppetlabs.com/razor/v1/commands/update-tag-rule","id":"http://localhost:8080/api/commands/update-tag-rule"}],"collections":[{"name":"brokers","rel":"http://api.puppetlabs.com/razor/v1/collections/brokers","id":"http://localhost:8080/api/collections/brokers"},{"name":"repos","rel":"http://api.puppetlabs.com/razor/v1/collections/repos","id":"http://localhost:8080/api/collections/repos"},{"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"},{"name":"tasks","rel":"http://api.puppetlabs.com/razor/v1/collections/tasks","id":"http://localhost:8080/api/collections/tasks"},{"name":"commands","rel":"http://api.puppetlabs.com/razor/v1/collections/commands","id":"http://localhost:8080/api/collections/commands"}],"version":{"server":"v0.14.1-125-g591a14d-dirty"}}'
+      string: '{"commands":[{"name":"add-policy-tag","rel":"http://api.puppetlabs.com/razor/v1/commands/add-policy-tag","id":"http://localhost:8150/api/commands/add-policy-tag"},{"name":"create-broker","rel":"http://api.puppetlabs.com/razor/v1/commands/create-broker","id":"http://localhost:8150/api/commands/create-broker"},{"name":"create-hook","rel":"http://api.puppetlabs.com/razor/v1/commands/create-hook","id":"http://localhost:8150/api/commands/create-hook"},{"name":"create-policy","rel":"http://api.puppetlabs.com/razor/v1/commands/create-policy","id":"http://localhost:8150/api/commands/create-policy"},{"name":"create-repo","rel":"http://api.puppetlabs.com/razor/v1/commands/create-repo","id":"http://localhost:8150/api/commands/create-repo"},{"name":"create-tag","rel":"http://api.puppetlabs.com/razor/v1/commands/create-tag","id":"http://localhost:8150/api/commands/create-tag"},{"name":"create-task","rel":"http://api.puppetlabs.com/razor/v1/commands/create-task","id":"http://localhost:8150/api/commands/create-task"},{"name":"delete-broker","rel":"http://api.puppetlabs.com/razor/v1/commands/delete-broker","id":"http://localhost:8150/api/commands/delete-broker"},{"name":"delete-hook","rel":"http://api.puppetlabs.com/razor/v1/commands/delete-hook","id":"http://localhost:8150/api/commands/delete-hook"},{"name":"delete-node","rel":"http://api.puppetlabs.com/razor/v1/commands/delete-node","id":"http://localhost:8150/api/commands/delete-node"},{"name":"delete-policy","rel":"http://api.puppetlabs.com/razor/v1/commands/delete-policy","id":"http://localhost:8150/api/commands/delete-policy"},{"name":"delete-repo","rel":"http://api.puppetlabs.com/razor/v1/commands/delete-repo","id":"http://localhost:8150/api/commands/delete-repo"},{"name":"delete-tag","rel":"http://api.puppetlabs.com/razor/v1/commands/delete-tag","id":"http://localhost:8150/api/commands/delete-tag"},{"name":"disable-policy","rel":"http://api.puppetlabs.com/razor/v1/commands/disable-policy","id":"http://localhost:8150/api/commands/disable-policy"},{"name":"enable-policy","rel":"http://api.puppetlabs.com/razor/v1/commands/enable-policy","id":"http://localhost:8150/api/commands/enable-policy"},{"name":"modify-node-metadata","rel":"http://api.puppetlabs.com/razor/v1/commands/modify-node-metadata","id":"http://localhost:8150/api/commands/modify-node-metadata"},{"name":"modify-policy-max-count","rel":"http://api.puppetlabs.com/razor/v1/commands/modify-policy-max-count","id":"http://localhost:8150/api/commands/modify-policy-max-count"},{"name":"move-policy","rel":"http://api.puppetlabs.com/razor/v1/commands/move-policy","id":"http://localhost:8150/api/commands/move-policy"},{"name":"reboot-node","rel":"http://api.puppetlabs.com/razor/v1/commands/reboot-node","id":"http://localhost:8150/api/commands/reboot-node"},{"name":"register-node","rel":"http://api.puppetlabs.com/razor/v1/commands/register-node","id":"http://localhost:8150/api/commands/register-node"},{"name":"reinstall-node","rel":"http://api.puppetlabs.com/razor/v1/commands/reinstall-node","id":"http://localhost:8150/api/commands/reinstall-node"},{"name":"remove-node-metadata","rel":"http://api.puppetlabs.com/razor/v1/commands/remove-node-metadata","id":"http://localhost:8150/api/commands/remove-node-metadata"},{"name":"remove-policy-tag","rel":"http://api.puppetlabs.com/razor/v1/commands/remove-policy-tag","id":"http://localhost:8150/api/commands/remove-policy-tag"},{"name":"set-node-desired-power-state","rel":"http://api.puppetlabs.com/razor/v1/commands/set-node-desired-power-state","id":"http://localhost:8150/api/commands/set-node-desired-power-state"},{"name":"set-node-hw-info","rel":"http://api.puppetlabs.com/razor/v1/commands/set-node-hw-info","id":"http://localhost:8150/api/commands/set-node-hw-info"},{"name":"set-node-ipmi-credentials","rel":"http://api.puppetlabs.com/razor/v1/commands/set-node-ipmi-credentials","id":"http://localhost:8150/api/commands/set-node-ipmi-credentials"},{"name":"update-node-metadata","rel":"http://api.puppetlabs.com/razor/v1/commands/update-node-metadata","id":"http://localhost:8150/api/commands/update-node-metadata"},{"name":"update-tag-rule","rel":"http://api.puppetlabs.com/razor/v1/commands/update-tag-rule","id":"http://localhost:8150/api/commands/update-tag-rule"}],"collections":[{"name":"brokers","rel":"http://api.puppetlabs.com/razor/v1/collections/brokers","id":"http://localhost:8150/api/collections/brokers"},{"name":"repos","rel":"http://api.puppetlabs.com/razor/v1/collections/repos","id":"http://localhost:8150/api/collections/repos"},{"name":"tags","rel":"http://api.puppetlabs.com/razor/v1/collections/tags","id":"http://localhost:8150/api/collections/tags"},{"name":"policies","rel":"http://api.puppetlabs.com/razor/v1/collections/policies","id":"http://localhost:8150/api/collections/policies"},{"name":"nodes","rel":"http://api.puppetlabs.com/razor/v1/collections/nodes","id":"http://localhost:8150/api/collections/nodes","params":{"start":{"type":"number"},"limit":{"type":"number"}}},{"name":"tasks","rel":"http://api.puppetlabs.com/razor/v1/collections/tasks","id":"http://localhost:8150/api/collections/tasks"},{"name":"commands","rel":"http://api.puppetlabs.com/razor/v1/collections/commands","id":"http://localhost:8150/api/collections/commands"},{"name":"events","rel":"http://api.puppetlabs.com/razor/v1/collections/events","id":"http://localhost:8150/api/collections/events","params":{"start":{"type":"number"},"limit":{"type":"number"}}},{"name":"hooks","rel":"http://api.puppetlabs.com/razor/v1/collections/hooks","id":"http://localhost:8150/api/collections/hooks"}],"version":{"server":"v0.16.1-18-gd3acc7a-dirty"}}'
     http_version:
-  recorded_at: Wed, 21 May 2014 21:40:46 GMT
+  recorded_at: Mon, 09 Mar 2015 19:54:01 GMT
 - request:
     method: get
-    uri: http://localhost:8080/api/commands/create-repo
+    uri: http://localhost:8150/api/commands/create-repo
     body:
       encoding: US-ASCII
       string: ''
@@ -54,23 +54,23 @@ http_interactions:
       Server:
       - Apache-Coyote/1.1
       Etag:
-      - '"server-version-v0.14.1-125-g591a14d-dirty"'
+      - '"server-version-v0.16.1-18-gd3acc7a-dirty"'
       X-Content-Type-Options:
       - nosniff
       Content-Type:
       - application/json;charset=utf-8
       Content-Length:
-      - '3227'
+      - '7794'
       Date:
-      - Wed, 21 May 2014 21:40:46 GMT
+      - Mon, 09 Mar 2015 19:54:01 GMT
     body:
       encoding: US-ASCII
-      string: '{"name":"create-repo","help":{"full":"# SYNOPSIS\nCreate a new repository,
-        from an ISO image or a URL\n\n# DESCRIPTION\nCreate a new repository, which
-        can either contain the content to install a\nnode, or simply point to an existing
-        online repository by URL.\n\n\n# Access Control\n\nThis command''s access
-        control pattern: `commands:create-repo:%{name}`\n\nWords surrounded by `%{...}`
-        are substitutions from the input data: typically\nthe name of the object being
+      string: '{"name":"create-repo","help":{"summary":"Create a new repository, from
+        an ISO image or a URL","description":"Create a new repository, which can either
+        contain the content to install a\nnode, or simply point to an existing online
+        repository by URL.","schema":"# Access Control\n\nThis command''s access control
+        pattern: `commands:create-repo:%{name}`\n\nWords surrounded by `%{...}` are
+        substitutions from the input data: typically\nthe name of the object being
         modified, or some other critical detail, these\nallow roles to be granted
         partial access to modify the system.\n\nFor more detail on how the permission
         strings are structured and work, you can\nsee the [Shiro Permissions documentation][shiro].  That
@@ -78,143 +78,50 @@ http_interactions:
         command is authorized.\n\nThese checks only apply if security is enabled in
         the Razor configuration\nfile; on this server security is currently disabled.\n\n[shiro]:
         http://shiro.apache.org/permissions.html\n\n# Attributes\n\n * name\n   -
-        The name of the repository.\n   - This attribute is required\n   - It must
+        The name of the repository.\n   - This attribute is required.\n   - It must
         be of type string.\n   - It must be between 1 and 250 in length.\n\n * url\n   -
         The URL of the remote repository to use.\n   - It must be of type string.\n   -
-        If present, iso-url must not be present.\n   - It must be between 1 and 1000
-        in length.\n\n * iso-url\n   - The URL of the ISO image to download and unpack
-        to create the\n   repository.  This can be an HTTP or HTTPS URL, or it can
-        be a\n   file URL.\n   \n   In the later case, the file path is interpreted
-        as a path on the\n   Razor server, rather than a path on the client.  This
-        requires that\n   you manually place the ISO image on the server before invoking
-        the\n   command.\n   - It must be of type string.\n   - If present, url must
-        not be present.\n   - It must be between 1 and 1000 in length.\n\n * task\n   -
-        The name of the task associated with this repository.  This is used to\n   install
-        nodes that match a policy using this repository; generally it\n   should match
-        the OS that the URL or ISO-URL attributes point to.\n   - This attribute is
-        required\n   - It must be of type string.\n\n\n\n# EXAMPLES\n  Create a repository
-        from an ISO image, which will be downloaded and unpacked\n  by the razor-server
-        in the background:\n  \n      {\n        \"name\":    \"fedora19\",\n        \"iso-url\":
-        \"http://example.com/Fedora-19-x86_64-DVD.iso\"\n        \"task\":    \"fedora\"\n      }\n  \n  You
-        can also unpack an ISO image from a file *on the server*; this does not\n  upload
-        the file from the client:\n      {\n        \"name\":    \"fedora19\",\n        \"iso-url\":
-        \"file:///tmp/Fedora-19-x86_64-DVD.iso\"\n        \"task\":    \"fedora\"\n      }\n  \n  Finally,
-        you can providing a `url` property when you create the repository;\n  this
-        form is merely a pointer to a resource somehwere and nothing will be\n  downloaded
-        onto the Razor server:\n  \n      {\n        \"name\": \"fedora19\",\n        \"url\":  \"http://mirrors.n-ix.net/fedora/linux/releases/19/Fedora/x86_64/os/\"\n        \"task\":
-        \"fedora\"\n      }\n\n"},"schema":{"name":{"type":"string"},"url":{"type":"string"},"iso-url":{"type":"string"},"task":{"type":"string"}}}'
-    http_version:
-  recorded_at: Wed, 21 May 2014 21:40:46 GMT
-- request:
-    method: get
-    uri: http://localhost:8080/api/commands/create-repo
-    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
-      Etag:
-      - '"server-version-v0.14.1-125-g591a14d-dirty"'
-      X-Content-Type-Options:
-      - nosniff
-      Content-Type:
-      - application/json;charset=utf-8
-      Content-Length:
-      - '3227'
-      Date:
-      - Wed, 21 May 2014 21:40:46 GMT
-    body:
-      encoding: US-ASCII
-      string: '{"name":"create-repo","help":{"full":"# SYNOPSIS\nCreate a new repository,
-        from an ISO image or a URL\n\n# DESCRIPTION\nCreate a new repository, which
-        can either contain the content to install a\nnode, or simply point to an existing
-        online repository by URL.\n\n\n# Access Control\n\nThis command''s access
-        control pattern: `commands:create-repo:%{name}`\n\nWords surrounded by `%{...}`
-        are substitutions from the input data: typically\nthe name of the object being
-        modified, or some other critical detail, these\nallow roles to be granted
-        partial access to modify the system.\n\nFor more detail on how the permission
-        strings are structured and work, you can\nsee the [Shiro Permissions documentation][shiro].  That
-        pattern is expanded\nand then a permission check applied to it, before the
-        command is authorized.\n\nThese checks only apply if security is enabled in
-        the Razor configuration\nfile; on this server security is currently disabled.\n\n[shiro]:
-        http://shiro.apache.org/permissions.html\n\n# Attributes\n\n * name\n   -
-        The name of the repository.\n   - This attribute is required\n   - It must
-        be of type string.\n   - It must be between 1 and 250 in length.\n\n * url\n   -
-        The URL of the remote repository to use.\n   - It must be of type string.\n   -
-        If present, iso-url must not be present.\n   - It must be between 1 and 1000
-        in length.\n\n * iso-url\n   - The URL of the ISO image to download and unpack
-        to create the\n   repository.  This can be an HTTP or HTTPS URL, or it can
-        be a\n   file URL.\n   \n   In the later case, the file path is interpreted
-        as a path on the\n   Razor server, rather than a path on the client.  This
-        requires that\n   you manually place the ISO image on the server before invoking
-        the\n   command.\n   - It must be of type string.\n   - If present, url must
-        not be present.\n   - It must be between 1 and 1000 in length.\n\n * task\n   -
-        The name of the task associated with this repository.  This is used to\n   install
-        nodes that match a policy using this repository; generally it\n   should match
-        the OS that the URL or ISO-URL attributes point to.\n   - This attribute is
-        required\n   - It must be of type string.\n\n\n\n# EXAMPLES\n  Create a repository
-        from an ISO image, which will be downloaded and unpacked\n  by the razor-server
-        in the background:\n  \n      {\n        \"name\":    \"fedora19\",\n        \"iso-url\":
-        \"http://example.com/Fedora-19-x86_64-DVD.iso\"\n        \"task\":    \"fedora\"\n      }\n  \n  You
-        can also unpack an ISO image from a file *on the server*; this does not\n  upload
-        the file from the client:\n      {\n        \"name\":    \"fedora19\",\n        \"iso-url\":
-        \"file:///tmp/Fedora-19-x86_64-DVD.iso\"\n        \"task\":    \"fedora\"\n      }\n  \n  Finally,
-        you can providing a `url` property when you create the repository;\n  this
-        form is merely a pointer to a resource somehwere and nothing will be\n  downloaded
-        onto the Razor server:\n  \n      {\n        \"name\": \"fedora19\",\n        \"url\":  \"http://mirrors.n-ix.net/fedora/linux/releases/19/Fedora/x86_64/os/\"\n        \"task\":
-        \"fedora\"\n      }\n\n"},"schema":{"name":{"type":"string"},"url":{"type":"string"},"iso-url":{"type":"string"},"task":{"type":"string"}}}'
-    http_version:
-  recorded_at: Wed, 21 May 2014 21:40:46 GMT
-- request:
-    method: get
-    uri: http://localhost:8080/api/commands/create-repo
-    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
-      Etag:
-      - '"server-version-v0.14.1-125-g591a14d-dirty"'
-      X-Content-Type-Options:
-      - nosniff
-      Content-Type:
-      - application/json;charset=utf-8
-      Content-Length:
-      - '3227'
-      Date:
-      - Wed, 21 May 2014 21:40:46 GMT
-    body:
-      encoding: US-ASCII
-      string: '{"name":"create-repo","help":{"full":"# SYNOPSIS\nCreate a new repository,
-        from an ISO image or a URL\n\n# DESCRIPTION\nCreate a new repository, which
-        can either contain the content to install a\nnode, or simply point to an existing
-        online repository by URL.\n\n\n# Access Control\n\nThis command''s access
-        control pattern: `commands:create-repo:%{name}`\n\nWords surrounded by `%{...}`
-        are substitutions from the input data: typically\nthe name of the object being
+        If present, iso_url, no_content must not be present.\n   - It must be between
+        1 and 1000 in length.\n\n * iso_url\n   - The URL of the ISO image to download
+        and unpack to create the\n     repository.  This can be an HTTP or HTTPS URL,
+        or it can be a\n     file URL.\n     \n     In the latter case, the file path
+        is interpreted as a path on the\n     Razor server, rather than a path on
+        the client.  This requires that\n     you manually place the ISO image on
+        the server before invoking the\n     command.\n   - It must be of type string.\n   -
+        If present, url, no_content must not be present.\n   - It must be between
+        1 and 1000 in length.\n\n * no_content\n   - For cases where extraction will
+        be done manually, this argument\n     creates a stub directory in the repo
+        store where the extracted\n     contents can be placed.\n   - It must be of
+        type boolean.\n   - If present, iso_url, url must not be present.\n\n * task\n   -
+        The name of the task associated with this repository.  This is used to\n     install
+        nodes that match a policy using this repository; generally it\n     should
+        match the OS that the URL or ISO_URL attributes point to.\n   - This attribute
+        is required.\n   - It must be of type string.\n","examples":{"api":"Create
+        a repository from an ISO image, which will be downloaded and unpacked\nby
+        the razor-server in the background:\n\n    {\n      \"name\":    \"fedora19\",\n      \"iso_url\":
+        \"http://example.com/Fedora-19-x86_64-DVD.iso\"\n      \"task\":    \"fedora\"\n    }\n\nYou
+        can also unpack an ISO image from a file *on the server*; this does not\nupload
+        the file from the client:\n    {\n      \"name\":    \"fedora19\",\n      \"iso_url\":
+        \"file:///tmp/Fedora-19-x86_64-DVD.iso\"\n      \"task\":    \"fedora\"\n    }\n\nFinally,
+        you can provide a `url` property when you create the repository;\nthis form
+        is merely a pointer to a resource somewhere and nothing will be\ndownloaded
+        onto the Razor server:\n\n    {\n      \"name\": \"fedora19\",\n      \"url\":  \"http://mirrors.n-ix.net/fedora/linux/releases/19/Fedora/x86_64/os/\"\n      \"task\":
+        \"fedora\"\n    }","cli":"Create a repository from an ISO image, which will
+        be downloaded and unpacked\nby the razor-server in the background:\n\n    razor
+        create-repo --name fedora19 \\\n        --iso-url http://example.com/Fedora-19-x86_64-DVD.iso
+        \\\n        --task fedora\n\nYou can also unpack an ISO image from a file
+        *on the server*; this does not\nupload the file from the client:\n\n    razor
+        create-repo --name fedora19 \\\n        --iso-url file:///tmp/Fedora-19-x86_64-DVD.iso
+        \\\n        --task fedora\n\nFinally, you can provide a `url` property when
+        you create the repository;\nthis form is merely a pointer to a resource somewhere
+        and nothing will be\ndownloaded onto the Razor server:\n\n    razor create-repo
+        --name fedora19 --iso-url \\\n        http://mirrors.n-ix.net/fedora/linux/releases/19/Fedora/x86_64/os/
+        \\\n        --task fedora"},"full":"# SYNOPSIS\nCreate a new repository, from
+        an ISO image or a URL\n\n# DESCRIPTION\nCreate a new repository, which can
+        either contain the content to install a\nnode, or simply point to an existing
+        online repository by URL.\n# Access Control\n\nThis command''s access control
+        pattern: `commands:create-repo:%{name}`\n\nWords surrounded by `%{...}` are
+        substitutions from the input data: typically\nthe name of the object being
         modified, or some other critical detail, these\nallow roles to be granted
         partial access to modify the system.\n\nFor more detail on how the permission
         strings are structured and work, you can\nsee the [Shiro Permissions documentation][shiro].  That
@@ -222,36 +129,40 @@ http_interactions:
         command is authorized.\n\nThese checks only apply if security is enabled in
         the Razor configuration\nfile; on this server security is currently disabled.\n\n[shiro]:
         http://shiro.apache.org/permissions.html\n\n# Attributes\n\n * name\n   -
-        The name of the repository.\n   - This attribute is required\n   - It must
+        The name of the repository.\n   - This attribute is required.\n   - It must
         be of type string.\n   - It must be between 1 and 250 in length.\n\n * url\n   -
         The URL of the remote repository to use.\n   - It must be of type string.\n   -
-        If present, iso-url must not be present.\n   - It must be between 1 and 1000
-        in length.\n\n * iso-url\n   - The URL of the ISO image to download and unpack
-        to create the\n   repository.  This can be an HTTP or HTTPS URL, or it can
-        be a\n   file URL.\n   \n   In the later case, the file path is interpreted
-        as a path on the\n   Razor server, rather than a path on the client.  This
-        requires that\n   you manually place the ISO image on the server before invoking
-        the\n   command.\n   - It must be of type string.\n   - If present, url must
-        not be present.\n   - It must be between 1 and 1000 in length.\n\n * task\n   -
-        The name of the task associated with this repository.  This is used to\n   install
-        nodes that match a policy using this repository; generally it\n   should match
-        the OS that the URL or ISO-URL attributes point to.\n   - This attribute is
-        required\n   - It must be of type string.\n\n\n\n# EXAMPLES\n  Create a repository
-        from an ISO image, which will be downloaded and unpacked\n  by the razor-server
-        in the background:\n  \n      {\n        \"name\":    \"fedora19\",\n        \"iso-url\":
+        If present, iso_url, no_content must not be present.\n   - It must be between
+        1 and 1000 in length.\n\n * iso_url\n   - The URL of the ISO image to download
+        and unpack to create the\n     repository.  This can be an HTTP or HTTPS URL,
+        or it can be a\n     file URL.\n     \n     In the latter case, the file path
+        is interpreted as a path on the\n     Razor server, rather than a path on
+        the client.  This requires that\n     you manually place the ISO image on
+        the server before invoking the\n     command.\n   - It must be of type string.\n   -
+        If present, url, no_content must not be present.\n   - It must be between
+        1 and 1000 in length.\n\n * no_content\n   - For cases where extraction will
+        be done manually, this argument\n     creates a stub directory in the repo
+        store where the extracted\n     contents can be placed.\n   - It must be of
+        type boolean.\n   - If present, iso_url, url must not be present.\n\n * task\n   -
+        The name of the task associated with this repository.  This is used to\n     install
+        nodes that match a policy using this repository; generally it\n     should
+        match the OS that the URL or ISO_URL attributes point to.\n   - This attribute
+        is required.\n   - It must be of type string.\n\n# EXAMPLES\n\n  Create a
+        repository from an ISO image, which will be downloaded and unpacked\n  by
+        the razor-server in the background:\n  \n      {\n        \"name\":    \"fedora19\",\n        \"iso_url\":
         \"http://example.com/Fedora-19-x86_64-DVD.iso\"\n        \"task\":    \"fedora\"\n      }\n  \n  You
         can also unpack an ISO image from a file *on the server*; this does not\n  upload
-        the file from the client:\n      {\n        \"name\":    \"fedora19\",\n        \"iso-url\":
+        the file from the client:\n      {\n        \"name\":    \"fedora19\",\n        \"iso_url\":
         \"file:///tmp/Fedora-19-x86_64-DVD.iso\"\n        \"task\":    \"fedora\"\n      }\n  \n  Finally,
-        you can providing a `url` property when you create the repository;\n  this
-        form is merely a pointer to a resource somehwere and nothing will be\n  downloaded
+        you can provide a `url` property when you create the repository;\n  this form
+        is merely a pointer to a resource somewhere and nothing will be\n  downloaded
         onto the Razor server:\n  \n      {\n        \"name\": \"fedora19\",\n        \"url\":  \"http://mirrors.n-ix.net/fedora/linux/releases/19/Fedora/x86_64/os/\"\n        \"task\":
-        \"fedora\"\n      }\n\n"},"schema":{"name":{"type":"string"},"url":{"type":"string"},"iso-url":{"type":"string"},"task":{"type":"string"}}}'
+        \"fedora\"\n      }\n"},"schema":{"name":{"type":"string"},"url":{"type":"string"},"iso_url":{"type":"string","aliases":["iso-url"]},"no_content":{"type":"boolean","aliases":["no-content"]},"task":{"type":"string"}}}'
     http_version:
-  recorded_at: Wed, 21 May 2014 21:40:46 GMT
+  recorded_at: Mon, 09 Mar 2015 19:54:01 GMT
 - request:
     method: post
-    uri: http://localhost:8080/api/commands/create-repo
+    uri: http://localhost:8150/api/commands/create-repo
     body:
       encoding: UTF-8
       string: '{"name":"separate with spaces","url":"http://url.com/some.iso","task":"noop"}'
@@ -280,16 +191,16 @@ http_interactions:
       Content-Length:
       - '237'
       Date:
-      - Wed, 21 May 2014 21:40:46 GMT
+      - Mon, 09 Mar 2015 19:54:01 GMT
     body:
       encoding: US-ASCII
-      string: '{"spec":"http://api.puppetlabs.com/razor/v1/collections/repos/member","id":"http://localhost:8080/api/collections/repos/separate%20with%20spaces","name":"separate
-        with spaces","command":"http://localhost:8080/api/collections/commands/1"}'
+      string: '{"spec":"http://api.puppetlabs.com/razor/v1/collections/repos/member","id":"http://localhost:8150/api/collections/repos/separate%20with%20spaces","name":"separate
+        with spaces","command":"http://localhost:8150/api/collections/commands/1"}'
     http_version:
-  recorded_at: Wed, 21 May 2014 21:40:46 GMT
+  recorded_at: Mon, 09 Mar 2015 19:54:01 GMT
 - request:
     method: get
-    uri: http://localhost:8080/api/collections/repos/separate%20with%20spaces
+    uri: http://localhost:8150/api/collections/repos/separate%20with%20spaces
     body:
       encoding: US-ASCII
       string: ''
@@ -314,16 +225,16 @@ http_interactions:
       Content-Length:
       - '371'
       Date:
-      - Wed, 21 May 2014 21:40:46 GMT
+      - Mon, 09 Mar 2015 19:54:01 GMT
     body:
       encoding: US-ASCII
-      string: '{"spec":"http://api.puppetlabs.com/razor/v1/collections/repos/member","id":"http://localhost:8080/api/collections/repos/separate%20with%20spaces","name":"separate
-        with spaces","iso_url":null,"url":"http://url.com/some.iso","task":{"spec":"http://api.puppetlabs.com/razor/v1/collections/tasks/member","id":"http://localhost:8080/api/collections/tasks/noop","name":"noop"}}'
+      string: '{"spec":"http://api.puppetlabs.com/razor/v1/collections/repos/member","id":"http://localhost:8150/api/collections/repos/separate%20with%20spaces","name":"separate
+        with spaces","iso_url":null,"url":"http://url.com/some.iso","task":{"spec":"http://api.puppetlabs.com/razor/v1/collections/tasks/member","id":"http://localhost:8150/api/collections/tasks/noop","name":"noop"}}'
     http_version:
-  recorded_at: Wed, 21 May 2014 21:40:46 GMT
+  recorded_at: Mon, 09 Mar 2015 19:54:01 GMT
 - request:
     method: get
-    uri: http://localhost:8080/api
+    uri: http://localhost:8150/api
     body:
       encoding: US-ASCII
       string: ''
@@ -346,17 +257,17 @@ http_interactions:
       Content-Type:
       - application/json;charset=utf-8
       Content-Length:
-      - '4982'
+      - '5650'
       Date:
-      - Wed, 21 May 2014 21:40:46 GMT
+      - Mon, 09 Mar 2015 19:54:01 GMT
     body:
       encoding: US-ASCII
-      string: '{"commands":[{"name":"add-policy-tag","rel":"http://api.puppetlabs.com/razor/v1/commands/add-policy-tag","id":"http://localhost:8080/api/commands/add-policy-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"},{"name":"create-repo","rel":"http://api.puppetlabs.com/razor/v1/commands/create-repo","id":"http://localhost:8080/api/commands/create-repo"},{"name":"create-tag","rel":"http://api.puppetlabs.com/razor/v1/commands/create-tag","id":"http://localhost:8080/api/commands/create-tag"},{"name":"create-task","rel":"http://api.puppetlabs.com/razor/v1/commands/create-task","id":"http://localhost:8080/api/commands/create-task"},{"name":"delete-broker","rel":"http://api.puppetlabs.com/razor/v1/commands/delete-broker","id":"http://localhost:8080/api/commands/delete-broker"},{"name":"delete-node","rel":"http://api.puppetlabs.com/razor/v1/commands/delete-node","id":"http://localhost:8080/api/commands/delete-node"},{"name":"delete-policy","rel":"http://api.puppetlabs.com/razor/v1/commands/delete-policy","id":"http://localhost:8080/api/commands/delete-policy"},{"name":"delete-repo","rel":"http://api.puppetlabs.com/razor/v1/commands/delete-repo","id":"http://localhost:8080/api/commands/delete-repo"},{"name":"delete-tag","rel":"http://api.puppetlabs.com/razor/v1/commands/delete-tag","id":"http://localhost:8080/api/commands/delete-tag"},{"name":"disable-policy","rel":"http://api.puppetlabs.com/razor/v1/commands/disable-policy","id":"http://localhost:8080/api/commands/disable-policy"},{"name":"enable-policy","rel":"http://api.puppetlabs.com/razor/v1/commands/enable-policy","id":"http://localhost:8080/api/commands/enable-policy"},{"name":"modify-node-metadata","rel":"http://api.puppetlabs.com/razor/v1/commands/modify-node-metadata","id":"http://localhost:8080/api/commands/modify-node-metadata"},{"name":"modify-policy-max-count","rel":"http://api.puppetlabs.com/razor/v1/commands/modify-policy-max-count","id":"http://localhost:8080/api/commands/modify-policy-max-count"},{"name":"move-policy","rel":"http://api.puppetlabs.com/razor/v1/commands/move-policy","id":"http://localhost:8080/api/commands/move-policy"},{"name":"reboot-node","rel":"http://api.puppetlabs.com/razor/v1/commands/reboot-node","id":"http://localhost:8080/api/commands/reboot-node"},{"name":"register-node","rel":"http://api.puppetlabs.com/razor/v1/commands/register-node","id":"http://localhost:8080/api/commands/register-node"},{"name":"reinstall-node","rel":"http://api.puppetlabs.com/razor/v1/commands/reinstall-node","id":"http://localhost:8080/api/commands/reinstall-node"},{"name":"remove-node-metadata","rel":"http://api.puppetlabs.com/razor/v1/commands/remove-node-metadata","id":"http://localhost:8080/api/commands/remove-node-metadata"},{"name":"remove-policy-tag","rel":"http://api.puppetlabs.com/razor/v1/commands/remove-policy-tag","id":"http://localhost:8080/api/commands/remove-policy-tag"},{"name":"set-node-desired-power-state","rel":"http://api.puppetlabs.com/razor/v1/commands/set-node-desired-power-state","id":"http://localhost:8080/api/commands/set-node-desired-power-state"},{"name":"set-node-hw-info","rel":"http://api.puppetlabs.com/razor/v1/commands/set-node-hw-info","id":"http://localhost:8080/api/commands/set-node-hw-info"},{"name":"set-node-ipmi-credentials","rel":"http://api.puppetlabs.com/razor/v1/commands/set-node-ipmi-credentials","id":"http://localhost:8080/api/commands/set-node-ipmi-credentials"},{"name":"update-node-metadata","rel":"http://api.puppetlabs.com/razor/v1/commands/update-node-metadata","id":"http://localhost:8080/api/commands/update-node-metadata"},{"name":"update-tag-rule","rel":"http://api.puppetlabs.com/razor/v1/commands/update-tag-rule","id":"http://localhost:8080/api/commands/update-tag-rule"}],"collections":[{"name":"brokers","rel":"http://api.puppetlabs.com/razor/v1/collections/brokers","id":"http://localhost:8080/api/collections/brokers"},{"name":"repos","rel":"http://api.puppetlabs.com/razor/v1/collections/repos","id":"http://localhost:8080/api/collections/repos"},{"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"},{"name":"tasks","rel":"http://api.puppetlabs.com/razor/v1/collections/tasks","id":"http://localhost:8080/api/collections/tasks"},{"name":"commands","rel":"http://api.puppetlabs.com/razor/v1/collections/commands","id":"http://localhost:8080/api/collections/commands"}],"version":{"server":"v0.14.1-125-g591a14d-dirty"}}'
+      string: '{"commands":[{"name":"add-policy-tag","rel":"http://api.puppetlabs.com/razor/v1/commands/add-policy-tag","id":"http://localhost:8150/api/commands/add-policy-tag"},{"name":"create-broker","rel":"http://api.puppetlabs.com/razor/v1/commands/create-broker","id":"http://localhost:8150/api/commands/create-broker"},{"name":"create-hook","rel":"http://api.puppetlabs.com/razor/v1/commands/create-hook","id":"http://localhost:8150/api/commands/create-hook"},{"name":"create-policy","rel":"http://api.puppetlabs.com/razor/v1/commands/create-policy","id":"http://localhost:8150/api/commands/create-policy"},{"name":"create-repo","rel":"http://api.puppetlabs.com/razor/v1/commands/create-repo","id":"http://localhost:8150/api/commands/create-repo"},{"name":"create-tag","rel":"http://api.puppetlabs.com/razor/v1/commands/create-tag","id":"http://localhost:8150/api/commands/create-tag"},{"name":"create-task","rel":"http://api.puppetlabs.com/razor/v1/commands/create-task","id":"http://localhost:8150/api/commands/create-task"},{"name":"delete-broker","rel":"http://api.puppetlabs.com/razor/v1/commands/delete-broker","id":"http://localhost:8150/api/commands/delete-broker"},{"name":"delete-hook","rel":"http://api.puppetlabs.com/razor/v1/commands/delete-hook","id":"http://localhost:8150/api/commands/delete-hook"},{"name":"delete-node","rel":"http://api.puppetlabs.com/razor/v1/commands/delete-node","id":"http://localhost:8150/api/commands/delete-node"},{"name":"delete-policy","rel":"http://api.puppetlabs.com/razor/v1/commands/delete-policy","id":"http://localhost:8150/api/commands/delete-policy"},{"name":"delete-repo","rel":"http://api.puppetlabs.com/razor/v1/commands/delete-repo","id":"http://localhost:8150/api/commands/delete-repo"},{"name":"delete-tag","rel":"http://api.puppetlabs.com/razor/v1/commands/delete-tag","id":"http://localhost:8150/api/commands/delete-tag"},{"name":"disable-policy","rel":"http://api.puppetlabs.com/razor/v1/commands/disable-policy","id":"http://localhost:8150/api/commands/disable-policy"},{"name":"enable-policy","rel":"http://api.puppetlabs.com/razor/v1/commands/enable-policy","id":"http://localhost:8150/api/commands/enable-policy"},{"name":"modify-node-metadata","rel":"http://api.puppetlabs.com/razor/v1/commands/modify-node-metadata","id":"http://localhost:8150/api/commands/modify-node-metadata"},{"name":"modify-policy-max-count","rel":"http://api.puppetlabs.com/razor/v1/commands/modify-policy-max-count","id":"http://localhost:8150/api/commands/modify-policy-max-count"},{"name":"move-policy","rel":"http://api.puppetlabs.com/razor/v1/commands/move-policy","id":"http://localhost:8150/api/commands/move-policy"},{"name":"reboot-node","rel":"http://api.puppetlabs.com/razor/v1/commands/reboot-node","id":"http://localhost:8150/api/commands/reboot-node"},{"name":"register-node","rel":"http://api.puppetlabs.com/razor/v1/commands/register-node","id":"http://localhost:8150/api/commands/register-node"},{"name":"reinstall-node","rel":"http://api.puppetlabs.com/razor/v1/commands/reinstall-node","id":"http://localhost:8150/api/commands/reinstall-node"},{"name":"remove-node-metadata","rel":"http://api.puppetlabs.com/razor/v1/commands/remove-node-metadata","id":"http://localhost:8150/api/commands/remove-node-metadata"},{"name":"remove-policy-tag","rel":"http://api.puppetlabs.com/razor/v1/commands/remove-policy-tag","id":"http://localhost:8150/api/commands/remove-policy-tag"},{"name":"set-node-desired-power-state","rel":"http://api.puppetlabs.com/razor/v1/commands/set-node-desired-power-state","id":"http://localhost:8150/api/commands/set-node-desired-power-state"},{"name":"set-node-hw-info","rel":"http://api.puppetlabs.com/razor/v1/commands/set-node-hw-info","id":"http://localhost:8150/api/commands/set-node-hw-info"},{"name":"set-node-ipmi-credentials","rel":"http://api.puppetlabs.com/razor/v1/commands/set-node-ipmi-credentials","id":"http://localhost:8150/api/commands/set-node-ipmi-credentials"},{"name":"update-node-metadata","rel":"http://api.puppetlabs.com/razor/v1/commands/update-node-metadata","id":"http://localhost:8150/api/commands/update-node-metadata"},{"name":"update-tag-rule","rel":"http://api.puppetlabs.com/razor/v1/commands/update-tag-rule","id":"http://localhost:8150/api/commands/update-tag-rule"}],"collections":[{"name":"brokers","rel":"http://api.puppetlabs.com/razor/v1/collections/brokers","id":"http://localhost:8150/api/collections/brokers"},{"name":"repos","rel":"http://api.puppetlabs.com/razor/v1/collections/repos","id":"http://localhost:8150/api/collections/repos"},{"name":"tags","rel":"http://api.puppetlabs.com/razor/v1/collections/tags","id":"http://localhost:8150/api/collections/tags"},{"name":"policies","rel":"http://api.puppetlabs.com/razor/v1/collections/policies","id":"http://localhost:8150/api/collections/policies"},{"name":"nodes","rel":"http://api.puppetlabs.com/razor/v1/collections/nodes","id":"http://localhost:8150/api/collections/nodes","params":{"start":{"type":"number"},"limit":{"type":"number"}}},{"name":"tasks","rel":"http://api.puppetlabs.com/razor/v1/collections/tasks","id":"http://localhost:8150/api/collections/tasks"},{"name":"commands","rel":"http://api.puppetlabs.com/razor/v1/collections/commands","id":"http://localhost:8150/api/collections/commands"},{"name":"events","rel":"http://api.puppetlabs.com/razor/v1/collections/events","id":"http://localhost:8150/api/collections/events","params":{"start":{"type":"number"},"limit":{"type":"number"}}},{"name":"hooks","rel":"http://api.puppetlabs.com/razor/v1/collections/hooks","id":"http://localhost:8150/api/collections/hooks"}],"version":{"server":"v0.16.1-18-gd3acc7a-dirty"}}'
     http_version:
-  recorded_at: Wed, 21 May 2014 21:40:46 GMT
+  recorded_at: Mon, 09 Mar 2015 19:54:01 GMT
 - request:
     method: get
-    uri: http://localhost:8080/api/commands/create-repo
+    uri: http://localhost:8150/api/commands/create-repo
     body:
       encoding: US-ASCII
       string: ''
@@ -375,23 +286,23 @@ http_interactions:
       Server:
       - Apache-Coyote/1.1
       Etag:
-      - '"server-version-v0.14.1-125-g591a14d-dirty"'
+      - '"server-version-v0.16.1-18-gd3acc7a-dirty"'
       X-Content-Type-Options:
       - nosniff
       Content-Type:
       - application/json;charset=utf-8
       Content-Length:
-      - '3227'
+      - '7794'
       Date:
-      - Wed, 21 May 2014 21:40:46 GMT
+      - Mon, 09 Mar 2015 19:54:01 GMT
     body:
       encoding: US-ASCII
-      string: '{"name":"create-repo","help":{"full":"# SYNOPSIS\nCreate a new repository,
-        from an ISO image or a URL\n\n# DESCRIPTION\nCreate a new repository, which
-        can either contain the content to install a\nnode, or simply point to an existing
-        online repository by URL.\n\n\n# Access Control\n\nThis command''s access
-        control pattern: `commands:create-repo:%{name}`\n\nWords surrounded by `%{...}`
-        are substitutions from the input data: typically\nthe name of the object being
+      string: '{"name":"create-repo","help":{"summary":"Create a new repository, from
+        an ISO image or a URL","description":"Create a new repository, which can either
+        contain the content to install a\nnode, or simply point to an existing online
+        repository by URL.","schema":"# Access Control\n\nThis command''s access control
+        pattern: `commands:create-repo:%{name}`\n\nWords surrounded by `%{...}` are
+        substitutions from the input data: typically\nthe name of the object being
         modified, or some other critical detail, these\nallow roles to be granted
         partial access to modify the system.\n\nFor more detail on how the permission
         strings are structured and work, you can\nsee the [Shiro Permissions documentation][shiro].  That
@@ -399,71 +310,50 @@ http_interactions:
         command is authorized.\n\nThese checks only apply if security is enabled in
         the Razor configuration\nfile; on this server security is currently disabled.\n\n[shiro]:
         http://shiro.apache.org/permissions.html\n\n# Attributes\n\n * name\n   -
-        The name of the repository.\n   - This attribute is required\n   - It must
+        The name of the repository.\n   - This attribute is required.\n   - It must
         be of type string.\n   - It must be between 1 and 250 in length.\n\n * url\n   -
         The URL of the remote repository to use.\n   - It must be of type string.\n   -
-        If present, iso-url must not be present.\n   - It must be between 1 and 1000
-        in length.\n\n * iso-url\n   - The URL of the ISO image to download and unpack
-        to create the\n   repository.  This can be an HTTP or HTTPS URL, or it can
-        be a\n   file URL.\n   \n   In the later case, the file path is interpreted
-        as a path on the\n   Razor server, rather than a path on the client.  This
-        requires that\n   you manually place the ISO image on the server before invoking
-        the\n   command.\n   - It must be of type string.\n   - If present, url must
-        not be present.\n   - It must be between 1 and 1000 in length.\n\n * task\n   -
-        The name of the task associated with this repository.  This is used to\n   install
-        nodes that match a policy using this repository; generally it\n   should match
-        the OS that the URL or ISO-URL attributes point to.\n   - This attribute is
-        required\n   - It must be of type string.\n\n\n\n# EXAMPLES\n  Create a repository
-        from an ISO image, which will be downloaded and unpacked\n  by the razor-server
-        in the background:\n  \n      {\n        \"name\":    \"fedora19\",\n        \"iso-url\":
-        \"http://example.com/Fedora-19-x86_64-DVD.iso\"\n        \"task\":    \"fedora\"\n      }\n  \n  You
-        can also unpack an ISO image from a file *on the server*; this does not\n  upload
-        the file from the client:\n      {\n        \"name\":    \"fedora19\",\n        \"iso-url\":
-        \"file:///tmp/Fedora-19-x86_64-DVD.iso\"\n        \"task\":    \"fedora\"\n      }\n  \n  Finally,
-        you can providing a `url` property when you create the repository;\n  this
-        form is merely a pointer to a resource somehwere and nothing will be\n  downloaded
-        onto the Razor server:\n  \n      {\n        \"name\": \"fedora19\",\n        \"url\":  \"http://mirrors.n-ix.net/fedora/linux/releases/19/Fedora/x86_64/os/\"\n        \"task\":
-        \"fedora\"\n      }\n\n"},"schema":{"name":{"type":"string"},"url":{"type":"string"},"iso-url":{"type":"string"},"task":{"type":"string"}}}'
-    http_version:
-  recorded_at: Wed, 21 May 2014 21:40:46 GMT
-- request:
-    method: get
-    uri: http://localhost:8080/api/commands/create-repo
-    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
-      Etag:
-      - '"server-version-v0.14.1-125-g591a14d-dirty"'
-      X-Content-Type-Options:
-      - nosniff
-      Content-Type:
-      - application/json;charset=utf-8
-      Content-Length:
-      - '3227'
-      Date:
-      - Wed, 21 May 2014 21:40:46 GMT
-    body:
-      encoding: US-ASCII
-      string: '{"name":"create-repo","help":{"full":"# SYNOPSIS\nCreate a new repository,
-        from an ISO image or a URL\n\n# DESCRIPTION\nCreate a new repository, which
-        can either contain the content to install a\nnode, or simply point to an existing
-        online repository by URL.\n\n\n# Access Control\n\nThis command''s access
-        control pattern: `commands:create-repo:%{name}`\n\nWords surrounded by `%{...}`
-        are substitutions from the input data: typically\nthe name of the object being
+        If present, iso_url, no_content must not be present.\n   - It must be between
+        1 and 1000 in length.\n\n * iso_url\n   - The URL of the ISO image to download
+        and unpack to create the\n     repository.  This can be an HTTP or HTTPS URL,
+        or it can be a\n     file URL.\n     \n     In the latter case, the file path
+        is interpreted as a path on the\n     Razor server, rather than a path on
+        the client.  This requires that\n     you manually place the ISO image on
+        the server before invoking the\n     command.\n   - It must be of type string.\n   -
+        If present, url, no_content must not be present.\n   - It must be between
+        1 and 1000 in length.\n\n * no_content\n   - For cases where extraction will
+        be done manually, this argument\n     creates a stub directory in the repo
+        store where the extracted\n     contents can be placed.\n   - It must be of
+        type boolean.\n   - If present, iso_url, url must not be present.\n\n * task\n   -
+        The name of the task associated with this repository.  This is used to\n     install
+        nodes that match a policy using this repository; generally it\n     should
+        match the OS that the URL or ISO_URL attributes point to.\n   - This attribute
+        is required.\n   - It must be of type string.\n","examples":{"api":"Create
+        a repository from an ISO image, which will be downloaded and unpacked\nby
+        the razor-server in the background:\n\n    {\n      \"name\":    \"fedora19\",\n      \"iso_url\":
+        \"http://example.com/Fedora-19-x86_64-DVD.iso\"\n      \"task\":    \"fedora\"\n    }\n\nYou
+        can also unpack an ISO image from a file *on the server*; this does not\nupload
+        the file from the client:\n    {\n      \"name\":    \"fedora19\",\n      \"iso_url\":
+        \"file:///tmp/Fedora-19-x86_64-DVD.iso\"\n      \"task\":    \"fedora\"\n    }\n\nFinally,
+        you can provide a `url` property when you create the repository;\nthis form
+        is merely a pointer to a resource somewhere and nothing will be\ndownloaded
+        onto the Razor server:\n\n    {\n      \"name\": \"fedora19\",\n      \"url\":  \"http://mirrors.n-ix.net/fedora/linux/releases/19/Fedora/x86_64/os/\"\n      \"task\":
+        \"fedora\"\n    }","cli":"Create a repository from an ISO image, which will
+        be downloaded and unpacked\nby the razor-server in the background:\n\n    razor
+        create-repo --name fedora19 \\\n        --iso-url http://example.com/Fedora-19-x86_64-DVD.iso
+        \\\n        --task fedora\n\nYou can also unpack an ISO image from a file
+        *on the server*; this does not\nupload the file from the client:\n\n    razor
+        create-repo --name fedora19 \\\n        --iso-url file:///tmp/Fedora-19-x86_64-DVD.iso
+        \\\n        --task fedora\n\nFinally, you can provide a `url` property when
+        you create the repository;\nthis form is merely a pointer to a resource somewhere
+        and nothing will be\ndownloaded onto the Razor server:\n\n    razor create-repo
+        --name fedora19 --iso-url \\\n        http://mirrors.n-ix.net/fedora/linux/releases/19/Fedora/x86_64/os/
+        \\\n        --task fedora"},"full":"# SYNOPSIS\nCreate a new repository, from
+        an ISO image or a URL\n\n# DESCRIPTION\nCreate a new repository, which can
+        either contain the content to install a\nnode, or simply point to an existing
+        online repository by URL.\n# Access Control\n\nThis command''s access control
+        pattern: `commands:create-repo:%{name}`\n\nWords surrounded by `%{...}` are
+        substitutions from the input data: typically\nthe name of the object being
         modified, or some other critical detail, these\nallow roles to be granted
         partial access to modify the system.\n\nFor more detail on how the permission
         strings are structured and work, you can\nsee the [Shiro Permissions documentation][shiro].  That
@@ -471,111 +361,43 @@ http_interactions:
         command is authorized.\n\nThese checks only apply if security is enabled in
         the Razor configuration\nfile; on this server security is currently disabled.\n\n[shiro]:
         http://shiro.apache.org/permissions.html\n\n# Attributes\n\n * name\n   -
-        The name of the repository.\n   - This attribute is required\n   - It must
+        The name of the repository.\n   - This attribute is required.\n   - It must
         be of type string.\n   - It must be between 1 and 250 in length.\n\n * url\n   -
         The URL of the remote repository to use.\n   - It must be of type string.\n   -
-        If present, iso-url must not be present.\n   - It must be between 1 and 1000
-        in length.\n\n * iso-url\n   - The URL of the ISO image to download and unpack
-        to create the\n   repository.  This can be an HTTP or HTTPS URL, or it can
-        be a\n   file URL.\n   \n   In the later case, the file path is interpreted
-        as a path on the\n   Razor server, rather than a path on the client.  This
-        requires that\n   you manually place the ISO image on the server before invoking
-        the\n   command.\n   - It must be of type string.\n   - If present, url must
-        not be present.\n   - It must be between 1 and 1000 in length.\n\n * task\n   -
-        The name of the task associated with this repository.  This is used to\n   install
-        nodes that match a policy using this repository; generally it\n   should match
-        the OS that the URL or ISO-URL attributes point to.\n   - This attribute is
-        required\n   - It must be of type string.\n\n\n\n# EXAMPLES\n  Create a repository
-        from an ISO image, which will be downloaded and unpacked\n  by the razor-server
-        in the background:\n  \n      {\n        \"name\":    \"fedora19\",\n        \"iso-url\":
+        If present, iso_url, no_content must not be present.\n   - It must be between
+        1 and 1000 in length.\n\n * iso_url\n   - The URL of the ISO image to download
+        and unpack to create the\n     repository.  This can be an HTTP or HTTPS URL,
+        or it can be a\n     file URL.\n     \n     In the latter case, the file path
+        is interpreted as a path on the\n     Razor server, rather than a path on
+        the client.  This requires that\n     you manually place the ISO image on
+        the server before invoking the\n     command.\n   - It must be of type string.\n   -
+        If present, url, no_content must not be present.\n   - It must be between
+        1 and 1000 in length.\n\n * no_content\n   - For cases where extraction will
+        be done manually, this argument\n     creates a stub directory in the repo
+        store where the extracted\n     contents can be placed.\n   - It must be of
+        type boolean.\n   - If present, iso_url, url must not be present.\n\n * task\n   -
+        The name of the task associated with this repository.  This is used to\n     install
+        nodes that match a policy using this repository; generally it\n     should
+        match the OS that the URL or ISO_URL attributes point to.\n   - This attribute
+        is required.\n   - It must be of type string.\n\n# EXAMPLES\n\n  Create a
+        repository from an ISO image, which will be downloaded and unpacked\n  by
+        the razor-server in the background:\n  \n      {\n        \"name\":    \"fedora19\",\n        \"iso_url\":
         \"http://example.com/Fedora-19-x86_64-DVD.iso\"\n        \"task\":    \"fedora\"\n      }\n  \n  You
         can also unpack an ISO image from a file *on the server*; this does not\n  upload
-        the file from the client:\n      {\n        \"name\":    \"fedora19\",\n        \"iso-url\":
+        the file from the client:\n      {\n        \"name\":    \"fedora19\",\n        \"iso_url\":
         \"file:///tmp/Fedora-19-x86_64-DVD.iso\"\n        \"task\":    \"fedora\"\n      }\n  \n  Finally,
-        you can providing a `url` property when you create the repository;\n  this
-        form is merely a pointer to a resource somehwere and nothing will be\n  downloaded
+        you can provide a `url` property when you create the repository;\n  this form
+        is merely a pointer to a resource somewhere and nothing will be\n  downloaded
         onto the Razor server:\n  \n      {\n        \"name\": \"fedora19\",\n        \"url\":  \"http://mirrors.n-ix.net/fedora/linux/releases/19/Fedora/x86_64/os/\"\n        \"task\":
-        \"fedora\"\n      }\n\n"},"schema":{"name":{"type":"string"},"url":{"type":"string"},"iso-url":{"type":"string"},"task":{"type":"string"}}}'
+        \"fedora\"\n      }\n"},"schema":{"name":{"type":"string"},"url":{"type":"string"},"iso_url":{"type":"string","aliases":["iso-url"]},"no_content":{"type":"boolean","aliases":["no-content"]},"task":{"type":"string"}}}'
     http_version:
-  recorded_at: Wed, 21 May 2014 21:40:46 GMT
-- request:
-    method: get
-    uri: http://localhost:8080/api/commands/create-repo
-    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
-      Etag:
-      - '"server-version-v0.14.1-125-g591a14d-dirty"'
-      X-Content-Type-Options:
-      - nosniff
-      Content-Type:
-      - application/json;charset=utf-8
-      Content-Length:
-      - '3227'
-      Date:
-      - Wed, 21 May 2014 21:40:46 GMT
-    body:
-      encoding: US-ASCII
-      string: '{"name":"create-repo","help":{"full":"# SYNOPSIS\nCreate a new repository,
-        from an ISO image or a URL\n\n# DESCRIPTION\nCreate a new repository, which
-        can either contain the content to install a\nnode, or simply point to an existing
-        online repository by URL.\n\n\n# Access Control\n\nThis command''s access
-        control pattern: `commands:create-repo:%{name}`\n\nWords surrounded by `%{...}`
-        are substitutions from the input data: typically\nthe name of the object being
-        modified, or some other critical detail, these\nallow roles to be granted
-        partial access to modify the system.\n\nFor more detail on how the permission
-        strings are structured and work, you can\nsee the [Shiro Permissions documentation][shiro].  That
-        pattern is expanded\nand then a permission check applied to it, before the
-        command is authorized.\n\nThese checks only apply if security is enabled in
-        the Razor configuration\nfile; on this server security is currently disabled.\n\n[shiro]:
-        http://shiro.apache.org/permissions.html\n\n# Attributes\n\n * name\n   -
-        The name of the repository.\n   - This attribute is required\n   - It must
-        be of type string.\n   - It must be between 1 and 250 in length.\n\n * url\n   -
-        The URL of the remote repository to use.\n   - It must be of type string.\n   -
-        If present, iso-url must not be present.\n   - It must be between 1 and 1000
-        in length.\n\n * iso-url\n   - The URL of the ISO image to download and unpack
-        to create the\n   repository.  This can be an HTTP or HTTPS URL, or it can
-        be a\n   file URL.\n   \n   In the later case, the file path is interpreted
-        as a path on the\n   Razor server, rather than a path on the client.  This
-        requires that\n   you manually place the ISO image on the server before invoking
-        the\n   command.\n   - It must be of type string.\n   - If present, url must
-        not be present.\n   - It must be between 1 and 1000 in length.\n\n * task\n   -
-        The name of the task associated with this repository.  This is used to\n   install
-        nodes that match a policy using this repository; generally it\n   should match
-        the OS that the URL or ISO-URL attributes point to.\n   - This attribute is
-        required\n   - It must be of type string.\n\n\n\n# EXAMPLES\n  Create a repository
-        from an ISO image, which will be downloaded and unpacked\n  by the razor-server
-        in the background:\n  \n      {\n        \"name\":    \"fedora19\",\n        \"iso-url\":
-        \"http://example.com/Fedora-19-x86_64-DVD.iso\"\n        \"task\":    \"fedora\"\n      }\n  \n  You
-        can also unpack an ISO image from a file *on the server*; this does not\n  upload
-        the file from the client:\n      {\n        \"name\":    \"fedora19\",\n        \"iso-url\":
-        \"file:///tmp/Fedora-19-x86_64-DVD.iso\"\n        \"task\":    \"fedora\"\n      }\n  \n  Finally,
-        you can providing a `url` property when you create the repository;\n  this
-        form is merely a pointer to a resource somehwere and nothing will be\n  downloaded
-        onto the Razor server:\n  \n      {\n        \"name\": \"fedora19\",\n        \"url\":  \"http://mirrors.n-ix.net/fedora/linux/releases/19/Fedora/x86_64/os/\"\n        \"task\":
-        \"fedora\"\n      }\n\n"},"schema":{"name":{"type":"string"},"url":{"type":"string"},"iso-url":{"type":"string"},"task":{"type":"string"}}}'
-    http_version:
-  recorded_at: Wed, 21 May 2014 21:40:46 GMT
+  recorded_at: Mon, 09 Mar 2015 19:54:01 GMT
 - request:
     method: post
-    uri: http://localhost:8080/api/commands/create-repo
+    uri: http://localhost:8150/api/commands/create-repo
     body:
       encoding: UTF-8
-      string: '{"name":"double-quote with spaces\"","url":"http://url.com/some.iso","task":"noop"}'
+      string: '{"name":"\"double-quote with spaces\"","url":"http://url.com/some.iso","task":"noop"}'
     headers:
       Accept:
       - application/json
@@ -584,7 +406,7 @@ http_interactions:
       Content-Type:
       - application/json
       Content-Length:
-      - '83'
+      - '85'
       User-Agent:
       - Ruby
   response:
@@ -599,18 +421,18 @@ http_interactions:
       Content-Type:
       - application/json;charset=utf-8
       Content-Length:
-      - '250'
+      - '255'
       Date:
-      - Wed, 21 May 2014 21:40:46 GMT
+      - Mon, 09 Mar 2015 19:54:01 GMT
     body:
       encoding: US-ASCII
-      string: '{"spec":"http://api.puppetlabs.com/razor/v1/collections/repos/member","id":"http://localhost:8080/api/collections/repos/double-quote%20with%20spaces%22","name":"double-quote
-        with spaces\"","command":"http://localhost:8080/api/collections/commands/2"}'
+      string: '{"spec":"http://api.puppetlabs.com/razor/v1/collections/repos/member","id":"http://localhost:8150/api/collections/repos/%22double-quote%20with%20spaces%22","name":"\"double-quote
+        with spaces\"","command":"http://localhost:8150/api/collections/commands/2"}'
     http_version:
-  recorded_at: Wed, 21 May 2014 21:40:46 GMT
+  recorded_at: Mon, 09 Mar 2015 19:54:01 GMT
 - request:
     method: get
-    uri: http://localhost:8080/api/collections/repos/double-quote%20with%20spaces%22
+    uri: http://localhost:8150/api/collections/repos/%22double-quote%20with%20spaces%22
     body:
       encoding: US-ASCII
       string: ''
@@ -633,18 +455,18 @@ http_interactions:
       Content-Type:
       - application/json;charset=utf-8
       Content-Length:
-      - '384'
+      - '389'
       Date:
-      - Wed, 21 May 2014 21:40:46 GMT
+      - Mon, 09 Mar 2015 19:54:01 GMT
     body:
       encoding: US-ASCII
-      string: '{"spec":"http://api.puppetlabs.com/razor/v1/collections/repos/member","id":"http://localhost:8080/api/collections/repos/double-quote%20with%20spaces%22","name":"double-quote
-        with spaces\"","iso_url":null,"url":"http://url.com/some.iso","task":{"spec":"http://api.puppetlabs.com/razor/v1/collections/tasks/member","id":"http://localhost:8080/api/collections/tasks/noop","name":"noop"}}'
+      string: '{"spec":"http://api.puppetlabs.com/razor/v1/collections/repos/member","id":"http://localhost:8150/api/collections/repos/%22double-quote%20with%20spaces%22","name":"\"double-quote
+        with spaces\"","iso_url":null,"url":"http://url.com/some.iso","task":{"spec":"http://api.puppetlabs.com/razor/v1/collections/tasks/member","id":"http://localhost:8150/api/collections/tasks/noop","name":"noop"}}'
     http_version:
-  recorded_at: Wed, 21 May 2014 21:40:46 GMT
+  recorded_at: Mon, 09 Mar 2015 19:54:01 GMT
 - request:
     method: get
-    uri: http://localhost:8080/api
+    uri: http://localhost:8150/api
     body:
       encoding: US-ASCII
       string: ''
@@ -667,17 +489,17 @@ http_interactions:
       Content-Type:
       - application/json;charset=utf-8
       Content-Length:
-      - '4982'
+      - '5650'
       Date:
-      - Wed, 21 May 2014 21:40:46 GMT
+      - Mon, 09 Mar 2015 19:54:01 GMT
     body:
       encoding: US-ASCII
-      string: '{"commands":[{"name":"add-policy-tag","rel":"http://api.puppetlabs.com/razor/v1/commands/add-policy-tag","id":"http://localhost:8080/api/commands/add-policy-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"},{"name":"create-repo","rel":"http://api.puppetlabs.com/razor/v1/commands/create-repo","id":"http://localhost:8080/api/commands/create-repo"},{"name":"create-tag","rel":"http://api.puppetlabs.com/razor/v1/commands/create-tag","id":"http://localhost:8080/api/commands/create-tag"},{"name":"create-task","rel":"http://api.puppetlabs.com/razor/v1/commands/create-task","id":"http://localhost:8080/api/commands/create-task"},{"name":"delete-broker","rel":"http://api.puppetlabs.com/razor/v1/commands/delete-broker","id":"http://localhost:8080/api/commands/delete-broker"},{"name":"delete-node","rel":"http://api.puppetlabs.com/razor/v1/commands/delete-node","id":"http://localhost:8080/api/commands/delete-node"},{"name":"delete-policy","rel":"http://api.puppetlabs.com/razor/v1/commands/delete-policy","id":"http://localhost:8080/api/commands/delete-policy"},{"name":"delete-repo","rel":"http://api.puppetlabs.com/razor/v1/commands/delete-repo","id":"http://localhost:8080/api/commands/delete-repo"},{"name":"delete-tag","rel":"http://api.puppetlabs.com/razor/v1/commands/delete-tag","id":"http://localhost:8080/api/commands/delete-tag"},{"name":"disable-policy","rel":"http://api.puppetlabs.com/razor/v1/commands/disable-policy","id":"http://localhost:8080/api/commands/disable-policy"},{"name":"enable-policy","rel":"http://api.puppetlabs.com/razor/v1/commands/enable-policy","id":"http://localhost:8080/api/commands/enable-policy"},{"name":"modify-node-metadata","rel":"http://api.puppetlabs.com/razor/v1/commands/modify-node-metadata","id":"http://localhost:8080/api/commands/modify-node-metadata"},{"name":"modify-policy-max-count","rel":"http://api.puppetlabs.com/razor/v1/commands/modify-policy-max-count","id":"http://localhost:8080/api/commands/modify-policy-max-count"},{"name":"move-policy","rel":"http://api.puppetlabs.com/razor/v1/commands/move-policy","id":"http://localhost:8080/api/commands/move-policy"},{"name":"reboot-node","rel":"http://api.puppetlabs.com/razor/v1/commands/reboot-node","id":"http://localhost:8080/api/commands/reboot-node"},{"name":"register-node","rel":"http://api.puppetlabs.com/razor/v1/commands/register-node","id":"http://localhost:8080/api/commands/register-node"},{"name":"reinstall-node","rel":"http://api.puppetlabs.com/razor/v1/commands/reinstall-node","id":"http://localhost:8080/api/commands/reinstall-node"},{"name":"remove-node-metadata","rel":"http://api.puppetlabs.com/razor/v1/commands/remove-node-metadata","id":"http://localhost:8080/api/commands/remove-node-metadata"},{"name":"remove-policy-tag","rel":"http://api.puppetlabs.com/razor/v1/commands/remove-policy-tag","id":"http://localhost:8080/api/commands/remove-policy-tag"},{"name":"set-node-desired-power-state","rel":"http://api.puppetlabs.com/razor/v1/commands/set-node-desired-power-state","id":"http://localhost:8080/api/commands/set-node-desired-power-state"},{"name":"set-node-hw-info","rel":"http://api.puppetlabs.com/razor/v1/commands/set-node-hw-info","id":"http://localhost:8080/api/commands/set-node-hw-info"},{"name":"set-node-ipmi-credentials","rel":"http://api.puppetlabs.com/razor/v1/commands/set-node-ipmi-credentials","id":"http://localhost:8080/api/commands/set-node-ipmi-credentials"},{"name":"update-node-metadata","rel":"http://api.puppetlabs.com/razor/v1/commands/update-node-metadata","id":"http://localhost:8080/api/commands/update-node-metadata"},{"name":"update-tag-rule","rel":"http://api.puppetlabs.com/razor/v1/commands/update-tag-rule","id":"http://localhost:8080/api/commands/update-tag-rule"}],"collections":[{"name":"brokers","rel":"http://api.puppetlabs.com/razor/v1/collections/brokers","id":"http://localhost:8080/api/collections/brokers"},{"name":"repos","rel":"http://api.puppetlabs.com/razor/v1/collections/repos","id":"http://localhost:8080/api/collections/repos"},{"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"},{"name":"tasks","rel":"http://api.puppetlabs.com/razor/v1/collections/tasks","id":"http://localhost:8080/api/collections/tasks"},{"name":"commands","rel":"http://api.puppetlabs.com/razor/v1/collections/commands","id":"http://localhost:8080/api/collections/commands"}],"version":{"server":"v0.14.1-125-g591a14d-dirty"}}'
+      string: '{"commands":[{"name":"add-policy-tag","rel":"http://api.puppetlabs.com/razor/v1/commands/add-policy-tag","id":"http://localhost:8150/api/commands/add-policy-tag"},{"name":"create-broker","rel":"http://api.puppetlabs.com/razor/v1/commands/create-broker","id":"http://localhost:8150/api/commands/create-broker"},{"name":"create-hook","rel":"http://api.puppetlabs.com/razor/v1/commands/create-hook","id":"http://localhost:8150/api/commands/create-hook"},{"name":"create-policy","rel":"http://api.puppetlabs.com/razor/v1/commands/create-policy","id":"http://localhost:8150/api/commands/create-policy"},{"name":"create-repo","rel":"http://api.puppetlabs.com/razor/v1/commands/create-repo","id":"http://localhost:8150/api/commands/create-repo"},{"name":"create-tag","rel":"http://api.puppetlabs.com/razor/v1/commands/create-tag","id":"http://localhost:8150/api/commands/create-tag"},{"name":"create-task","rel":"http://api.puppetlabs.com/razor/v1/commands/create-task","id":"http://localhost:8150/api/commands/create-task"},{"name":"delete-broker","rel":"http://api.puppetlabs.com/razor/v1/commands/delete-broker","id":"http://localhost:8150/api/commands/delete-broker"},{"name":"delete-hook","rel":"http://api.puppetlabs.com/razor/v1/commands/delete-hook","id":"http://localhost:8150/api/commands/delete-hook"},{"name":"delete-node","rel":"http://api.puppetlabs.com/razor/v1/commands/delete-node","id":"http://localhost:8150/api/commands/delete-node"},{"name":"delete-policy","rel":"http://api.puppetlabs.com/razor/v1/commands/delete-policy","id":"http://localhost:8150/api/commands/delete-policy"},{"name":"delete-repo","rel":"http://api.puppetlabs.com/razor/v1/commands/delete-repo","id":"http://localhost:8150/api/commands/delete-repo"},{"name":"delete-tag","rel":"http://api.puppetlabs.com/razor/v1/commands/delete-tag","id":"http://localhost:8150/api/commands/delete-tag"},{"name":"disable-policy","rel":"http://api.puppetlabs.com/razor/v1/commands/disable-policy","id":"http://localhost:8150/api/commands/disable-policy"},{"name":"enable-policy","rel":"http://api.puppetlabs.com/razor/v1/commands/enable-policy","id":"http://localhost:8150/api/commands/enable-policy"},{"name":"modify-node-metadata","rel":"http://api.puppetlabs.com/razor/v1/commands/modify-node-metadata","id":"http://localhost:8150/api/commands/modify-node-metadata"},{"name":"modify-policy-max-count","rel":"http://api.puppetlabs.com/razor/v1/commands/modify-policy-max-count","id":"http://localhost:8150/api/commands/modify-policy-max-count"},{"name":"move-policy","rel":"http://api.puppetlabs.com/razor/v1/commands/move-policy","id":"http://localhost:8150/api/commands/move-policy"},{"name":"reboot-node","rel":"http://api.puppetlabs.com/razor/v1/commands/reboot-node","id":"http://localhost:8150/api/commands/reboot-node"},{"name":"register-node","rel":"http://api.puppetlabs.com/razor/v1/commands/register-node","id":"http://localhost:8150/api/commands/register-node"},{"name":"reinstall-node","rel":"http://api.puppetlabs.com/razor/v1/commands/reinstall-node","id":"http://localhost:8150/api/commands/reinstall-node"},{"name":"remove-node-metadata","rel":"http://api.puppetlabs.com/razor/v1/commands/remove-node-metadata","id":"http://localhost:8150/api/commands/remove-node-metadata"},{"name":"remove-policy-tag","rel":"http://api.puppetlabs.com/razor/v1/commands/remove-policy-tag","id":"http://localhost:8150/api/commands/remove-policy-tag"},{"name":"set-node-desired-power-state","rel":"http://api.puppetlabs.com/razor/v1/commands/set-node-desired-power-state","id":"http://localhost:8150/api/commands/set-node-desired-power-state"},{"name":"set-node-hw-info","rel":"http://api.puppetlabs.com/razor/v1/commands/set-node-hw-info","id":"http://localhost:8150/api/commands/set-node-hw-info"},{"name":"set-node-ipmi-credentials","rel":"http://api.puppetlabs.com/razor/v1/commands/set-node-ipmi-credentials","id":"http://localhost:8150/api/commands/set-node-ipmi-credentials"},{"name":"update-node-metadata","rel":"http://api.puppetlabs.com/razor/v1/commands/update-node-metadata","id":"http://localhost:8150/api/commands/update-node-metadata"},{"name":"update-tag-rule","rel":"http://api.puppetlabs.com/razor/v1/commands/update-tag-rule","id":"http://localhost:8150/api/commands/update-tag-rule"}],"collections":[{"name":"brokers","rel":"http://api.puppetlabs.com/razor/v1/collections/brokers","id":"http://localhost:8150/api/collections/brokers"},{"name":"repos","rel":"http://api.puppetlabs.com/razor/v1/collections/repos","id":"http://localhost:8150/api/collections/repos"},{"name":"tags","rel":"http://api.puppetlabs.com/razor/v1/collections/tags","id":"http://localhost:8150/api/collections/tags"},{"name":"policies","rel":"http://api.puppetlabs.com/razor/v1/collections/policies","id":"http://localhost:8150/api/collections/policies"},{"name":"nodes","rel":"http://api.puppetlabs.com/razor/v1/collections/nodes","id":"http://localhost:8150/api/collections/nodes","params":{"start":{"type":"number"},"limit":{"type":"number"}}},{"name":"tasks","rel":"http://api.puppetlabs.com/razor/v1/collections/tasks","id":"http://localhost:8150/api/collections/tasks"},{"name":"commands","rel":"http://api.puppetlabs.com/razor/v1/collections/commands","id":"http://localhost:8150/api/collections/commands"},{"name":"events","rel":"http://api.puppetlabs.com/razor/v1/collections/events","id":"http://localhost:8150/api/collections/events","params":{"start":{"type":"number"},"limit":{"type":"number"}}},{"name":"hooks","rel":"http://api.puppetlabs.com/razor/v1/collections/hooks","id":"http://localhost:8150/api/collections/hooks"}],"version":{"server":"v0.16.1-18-gd3acc7a-dirty"}}'
     http_version:
-  recorded_at: Wed, 21 May 2014 21:40:47 GMT
+  recorded_at: Mon, 09 Mar 2015 19:54:01 GMT
 - request:
     method: get
-    uri: http://localhost:8080/api/commands/create-repo
+    uri: http://localhost:8150/api/commands/create-repo
     body:
       encoding: US-ASCII
       string: ''
@@ -696,23 +518,23 @@ http_interactions:
       Server:
       - Apache-Coyote/1.1
       Etag:
-      - '"server-version-v0.14.1-125-g591a14d-dirty"'
+      - '"server-version-v0.16.1-18-gd3acc7a-dirty"'
       X-Content-Type-Options:
       - nosniff
       Content-Type:
       - application/json;charset=utf-8
       Content-Length:
-      - '3227'
+      - '7794'
       Date:
-      - Wed, 21 May 2014 21:40:46 GMT
+      - Mon, 09 Mar 2015 19:54:01 GMT
     body:
       encoding: US-ASCII
-      string: '{"name":"create-repo","help":{"full":"# SYNOPSIS\nCreate a new repository,
-        from an ISO image or a URL\n\n# DESCRIPTION\nCreate a new repository, which
-        can either contain the content to install a\nnode, or simply point to an existing
-        online repository by URL.\n\n\n# Access Control\n\nThis command''s access
-        control pattern: `commands:create-repo:%{name}`\n\nWords surrounded by `%{...}`
-        are substitutions from the input data: typically\nthe name of the object being
+      string: '{"name":"create-repo","help":{"summary":"Create a new repository, from
+        an ISO image or a URL","description":"Create a new repository, which can either
+        contain the content to install a\nnode, or simply point to an existing online
+        repository by URL.","schema":"# Access Control\n\nThis command''s access control
+        pattern: `commands:create-repo:%{name}`\n\nWords surrounded by `%{...}` are
+        substitutions from the input data: typically\nthe name of the object being
         modified, or some other critical detail, these\nallow roles to be granted
         partial access to modify the system.\n\nFor more detail on how the permission
         strings are structured and work, you can\nsee the [Shiro Permissions documentation][shiro].  That
@@ -720,143 +542,50 @@ http_interactions:
         command is authorized.\n\nThese checks only apply if security is enabled in
         the Razor configuration\nfile; on this server security is currently disabled.\n\n[shiro]:
         http://shiro.apache.org/permissions.html\n\n# Attributes\n\n * name\n   -
-        The name of the repository.\n   - This attribute is required\n   - It must
+        The name of the repository.\n   - This attribute is required.\n   - It must
         be of type string.\n   - It must be between 1 and 250 in length.\n\n * url\n   -
         The URL of the remote repository to use.\n   - It must be of type string.\n   -
-        If present, iso-url must not be present.\n   - It must be between 1 and 1000
-        in length.\n\n * iso-url\n   - The URL of the ISO image to download and unpack
-        to create the\n   repository.  This can be an HTTP or HTTPS URL, or it can
-        be a\n   file URL.\n   \n   In the later case, the file path is interpreted
-        as a path on the\n   Razor server, rather than a path on the client.  This
-        requires that\n   you manually place the ISO image on the server before invoking
-        the\n   command.\n   - It must be of type string.\n   - If present, url must
-        not be present.\n   - It must be between 1 and 1000 in length.\n\n * task\n   -
-        The name of the task associated with this repository.  This is used to\n   install
-        nodes that match a policy using this repository; generally it\n   should match
-        the OS that the URL or ISO-URL attributes point to.\n   - This attribute is
-        required\n   - It must be of type string.\n\n\n\n# EXAMPLES\n  Create a repository
-        from an ISO image, which will be downloaded and unpacked\n  by the razor-server
-        in the background:\n  \n      {\n        \"name\":    \"fedora19\",\n        \"iso-url\":
-        \"http://example.com/Fedora-19-x86_64-DVD.iso\"\n        \"task\":    \"fedora\"\n      }\n  \n  You
-        can also unpack an ISO image from a file *on the server*; this does not\n  upload
-        the file from the client:\n      {\n        \"name\":    \"fedora19\",\n        \"iso-url\":
-        \"file:///tmp/Fedora-19-x86_64-DVD.iso\"\n        \"task\":    \"fedora\"\n      }\n  \n  Finally,
-        you can providing a `url` property when you create the repository;\n  this
-        form is merely a pointer to a resource somehwere and nothing will be\n  downloaded
-        onto the Razor server:\n  \n      {\n        \"name\": \"fedora19\",\n        \"url\":  \"http://mirrors.n-ix.net/fedora/linux/releases/19/Fedora/x86_64/os/\"\n        \"task\":
-        \"fedora\"\n      }\n\n"},"schema":{"name":{"type":"string"},"url":{"type":"string"},"iso-url":{"type":"string"},"task":{"type":"string"}}}'
-    http_version:
-  recorded_at: Wed, 21 May 2014 21:40:47 GMT
-- request:
-    method: get
-    uri: http://localhost:8080/api/commands/create-repo
-    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
-      Etag:
-      - '"server-version-v0.14.1-125-g591a14d-dirty"'
-      X-Content-Type-Options:
-      - nosniff
-      Content-Type:
-      - application/json;charset=utf-8
-      Content-Length:
-      - '3227'
-      Date:
-      - Wed, 21 May 2014 21:40:46 GMT
-    body:
-      encoding: US-ASCII
-      string: '{"name":"create-repo","help":{"full":"# SYNOPSIS\nCreate a new repository,
-        from an ISO image or a URL\n\n# DESCRIPTION\nCreate a new repository, which
-        can either contain the content to install a\nnode, or simply point to an existing
-        online repository by URL.\n\n\n# Access Control\n\nThis command''s access
-        control pattern: `commands:create-repo:%{name}`\n\nWords surrounded by `%{...}`
-        are substitutions from the input data: typically\nthe name of the object being
-        modified, or some other critical detail, these\nallow roles to be granted
-        partial access to modify the system.\n\nFor more detail on how the permission
-        strings are structured and work, you can\nsee the [Shiro Permissions documentation][shiro].  That
-        pattern is expanded\nand then a permission check applied to it, before the
-        command is authorized.\n\nThese checks only apply if security is enabled in
-        the Razor configuration\nfile; on this server security is currently disabled.\n\n[shiro]:
-        http://shiro.apache.org/permissions.html\n\n# Attributes\n\n * name\n   -
-        The name of the repository.\n   - This attribute is required\n   - It must
-        be of type string.\n   - It must be between 1 and 250 in length.\n\n * url\n   -
-        The URL of the remote repository to use.\n   - It must be of type string.\n   -
-        If present, iso-url must not be present.\n   - It must be between 1 and 1000
-        in length.\n\n * iso-url\n   - The URL of the ISO image to download and unpack
-        to create the\n   repository.  This can be an HTTP or HTTPS URL, or it can
-        be a\n   file URL.\n   \n   In the later case, the file path is interpreted
-        as a path on the\n   Razor server, rather than a path on the client.  This
-        requires that\n   you manually place the ISO image on the server before invoking
-        the\n   command.\n   - It must be of type string.\n   - If present, url must
-        not be present.\n   - It must be between 1 and 1000 in length.\n\n * task\n   -
-        The name of the task associated with this repository.  This is used to\n   install
-        nodes that match a policy using this repository; generally it\n   should match
-        the OS that the URL or ISO-URL attributes point to.\n   - This attribute is
-        required\n   - It must be of type string.\n\n\n\n# EXAMPLES\n  Create a repository
-        from an ISO image, which will be downloaded and unpacked\n  by the razor-server
-        in the background:\n  \n      {\n        \"name\":    \"fedora19\",\n        \"iso-url\":
-        \"http://example.com/Fedora-19-x86_64-DVD.iso\"\n        \"task\":    \"fedora\"\n      }\n  \n  You
-        can also unpack an ISO image from a file *on the server*; this does not\n  upload
-        the file from the client:\n      {\n        \"name\":    \"fedora19\",\n        \"iso-url\":
-        \"file:///tmp/Fedora-19-x86_64-DVD.iso\"\n        \"task\":    \"fedora\"\n      }\n  \n  Finally,
-        you can providing a `url` property when you create the repository;\n  this
-        form is merely a pointer to a resource somehwere and nothing will be\n  downloaded
-        onto the Razor server:\n  \n      {\n        \"name\": \"fedora19\",\n        \"url\":  \"http://mirrors.n-ix.net/fedora/linux/releases/19/Fedora/x86_64/os/\"\n        \"task\":
-        \"fedora\"\n      }\n\n"},"schema":{"name":{"type":"string"},"url":{"type":"string"},"iso-url":{"type":"string"},"task":{"type":"string"}}}'
-    http_version:
-  recorded_at: Wed, 21 May 2014 21:40:47 GMT
-- request:
-    method: get
-    uri: http://localhost:8080/api/commands/create-repo
-    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
-      Etag:
-      - '"server-version-v0.14.1-125-g591a14d-dirty"'
-      X-Content-Type-Options:
-      - nosniff
-      Content-Type:
-      - application/json;charset=utf-8
-      Content-Length:
-      - '3227'
-      Date:
-      - Wed, 21 May 2014 21:40:46 GMT
-    body:
-      encoding: US-ASCII
-      string: '{"name":"create-repo","help":{"full":"# SYNOPSIS\nCreate a new repository,
-        from an ISO image or a URL\n\n# DESCRIPTION\nCreate a new repository, which
-        can either contain the content to install a\nnode, or simply point to an existing
-        online repository by URL.\n\n\n# Access Control\n\nThis command''s access
-        control pattern: `commands:create-repo:%{name}`\n\nWords surrounded by `%{...}`
-        are substitutions from the input data: typically\nthe name of the object being
+        If present, iso_url, no_content must not be present.\n   - It must be between
+        1 and 1000 in length.\n\n * iso_url\n   - The URL of the ISO image to download
+        and unpack to create the\n     repository.  This can be an HTTP or HTTPS URL,
+        or it can be a\n     file URL.\n     \n     In the latter case, the file path
+        is interpreted as a path on the\n     Razor server, rather than a path on
+        the client.  This requires that\n     you manually place the ISO image on
+        the server before invoking the\n     command.\n   - It must be of type string.\n   -
+        If present, url, no_content must not be present.\n   - It must be between
+        1 and 1000 in length.\n\n * no_content\n   - For cases where extraction will
+        be done manually, this argument\n     creates a stub directory in the repo
+        store where the extracted\n     contents can be placed.\n   - It must be of
+        type boolean.\n   - If present, iso_url, url must not be present.\n\n * task\n   -
+        The name of the task associated with this repository.  This is used to\n     install
+        nodes that match a policy using this repository; generally it\n     should
+        match the OS that the URL or ISO_URL attributes point to.\n   - This attribute
+        is required.\n   - It must be of type string.\n","examples":{"api":"Create
+        a repository from an ISO image, which will be downloaded and unpacked\nby
+        the razor-server in the background:\n\n    {\n      \"name\":    \"fedora19\",\n      \"iso_url\":
+        \"http://example.com/Fedora-19-x86_64-DVD.iso\"\n      \"task\":    \"fedora\"\n    }\n\nYou
+        can also unpack an ISO image from a file *on the server*; this does not\nupload
+        the file from the client:\n    {\n      \"name\":    \"fedora19\",\n      \"iso_url\":
+        \"file:///tmp/Fedora-19-x86_64-DVD.iso\"\n      \"task\":    \"fedora\"\n    }\n\nFinally,
+        you can provide a `url` property when you create the repository;\nthis form
+        is merely a pointer to a resource somewhere and nothing will be\ndownloaded
+        onto the Razor server:\n\n    {\n      \"name\": \"fedora19\",\n      \"url\":  \"http://mirrors.n-ix.net/fedora/linux/releases/19/Fedora/x86_64/os/\"\n      \"task\":
+        \"fedora\"\n    }","cli":"Create a repository from an ISO image, which will
+        be downloaded and unpacked\nby the razor-server in the background:\n\n    razor
+        create-repo --name fedora19 \\\n        --iso-url http://example.com/Fedora-19-x86_64-DVD.iso
+        \\\n        --task fedora\n\nYou can also unpack an ISO image from a file
+        *on the server*; this does not\nupload the file from the client:\n\n    razor
+        create-repo --name fedora19 \\\n        --iso-url file:///tmp/Fedora-19-x86_64-DVD.iso
+        \\\n        --task fedora\n\nFinally, you can provide a `url` property when
+        you create the repository;\nthis form is merely a pointer to a resource somewhere
+        and nothing will be\ndownloaded onto the Razor server:\n\n    razor create-repo
+        --name fedora19 --iso-url \\\n        http://mirrors.n-ix.net/fedora/linux/releases/19/Fedora/x86_64/os/
+        \\\n        --task fedora"},"full":"# SYNOPSIS\nCreate a new repository, from
+        an ISO image or a URL\n\n# DESCRIPTION\nCreate a new repository, which can
+        either contain the content to install a\nnode, or simply point to an existing
+        online repository by URL.\n# Access Control\n\nThis command''s access control
+        pattern: `commands:create-repo:%{name}`\n\nWords surrounded by `%{...}` are
+        substitutions from the input data: typically\nthe name of the object being
         modified, or some other critical detail, these\nallow roles to be granted
         partial access to modify the system.\n\nFor more detail on how the permission
         strings are structured and work, you can\nsee the [Shiro Permissions documentation][shiro].  That
@@ -864,39 +593,43 @@ http_interactions:
         command is authorized.\n\nThese checks only apply if security is enabled in
         the Razor configuration\nfile; on this server security is currently disabled.\n\n[shiro]:
         http://shiro.apache.org/permissions.html\n\n# Attributes\n\n * name\n   -
-        The name of the repository.\n   - This attribute is required\n   - It must
+        The name of the repository.\n   - This attribute is required.\n   - It must
         be of type string.\n   - It must be between 1 and 250 in length.\n\n * url\n   -
         The URL of the remote repository to use.\n   - It must be of type string.\n   -
-        If present, iso-url must not be present.\n   - It must be between 1 and 1000
-        in length.\n\n * iso-url\n   - The URL of the ISO image to download and unpack
-        to create the\n   repository.  This can be an HTTP or HTTPS URL, or it can
-        be a\n   file URL.\n   \n   In the later case, the file path is interpreted
-        as a path on the\n   Razor server, rather than a path on the client.  This
-        requires that\n   you manually place the ISO image on the server before invoking
-        the\n   command.\n   - It must be of type string.\n   - If present, url must
-        not be present.\n   - It must be between 1 and 1000 in length.\n\n * task\n   -
-        The name of the task associated with this repository.  This is used to\n   install
-        nodes that match a policy using this repository; generally it\n   should match
-        the OS that the URL or ISO-URL attributes point to.\n   - This attribute is
-        required\n   - It must be of type string.\n\n\n\n# EXAMPLES\n  Create a repository
-        from an ISO image, which will be downloaded and unpacked\n  by the razor-server
-        in the background:\n  \n      {\n        \"name\":    \"fedora19\",\n        \"iso-url\":
+        If present, iso_url, no_content must not be present.\n   - It must be between
+        1 and 1000 in length.\n\n * iso_url\n   - The URL of the ISO image to download
+        and unpack to create the\n     repository.  This can be an HTTP or HTTPS URL,
+        or it can be a\n     file URL.\n     \n     In the latter case, the file path
+        is interpreted as a path on the\n     Razor server, rather than a path on
+        the client.  This requires that\n     you manually place the ISO image on
+        the server before invoking the\n     command.\n   - It must be of type string.\n   -
+        If present, url, no_content must not be present.\n   - It must be between
+        1 and 1000 in length.\n\n * no_content\n   - For cases where extraction will
+        be done manually, this argument\n     creates a stub directory in the repo
+        store where the extracted\n     contents can be placed.\n   - It must be of
+        type boolean.\n   - If present, iso_url, url must not be present.\n\n * task\n   -
+        The name of the task associated with this repository.  This is used to\n     install
+        nodes that match a policy using this repository; generally it\n     should
+        match the OS that the URL or ISO_URL attributes point to.\n   - This attribute
+        is required.\n   - It must be of type string.\n\n# EXAMPLES\n\n  Create a
+        repository from an ISO image, which will be downloaded and unpacked\n  by
+        the razor-server in the background:\n  \n      {\n        \"name\":    \"fedora19\",\n        \"iso_url\":
         \"http://example.com/Fedora-19-x86_64-DVD.iso\"\n        \"task\":    \"fedora\"\n      }\n  \n  You
         can also unpack an ISO image from a file *on the server*; this does not\n  upload
-        the file from the client:\n      {\n        \"name\":    \"fedora19\",\n        \"iso-url\":
+        the file from the client:\n      {\n        \"name\":    \"fedora19\",\n        \"iso_url\":
         \"file:///tmp/Fedora-19-x86_64-DVD.iso\"\n        \"task\":    \"fedora\"\n      }\n  \n  Finally,
-        you can providing a `url` property when you create the repository;\n  this
-        form is merely a pointer to a resource somehwere and nothing will be\n  downloaded
+        you can provide a `url` property when you create the repository;\n  this form
+        is merely a pointer to a resource somewhere and nothing will be\n  downloaded
         onto the Razor server:\n  \n      {\n        \"name\": \"fedora19\",\n        \"url\":  \"http://mirrors.n-ix.net/fedora/linux/releases/19/Fedora/x86_64/os/\"\n        \"task\":
-        \"fedora\"\n      }\n\n"},"schema":{"name":{"type":"string"},"url":{"type":"string"},"iso-url":{"type":"string"},"task":{"type":"string"}}}'
+        \"fedora\"\n      }\n"},"schema":{"name":{"type":"string"},"url":{"type":"string"},"iso_url":{"type":"string","aliases":["iso-url"]},"no_content":{"type":"boolean","aliases":["no-content"]},"task":{"type":"string"}}}'
     http_version:
-  recorded_at: Wed, 21 May 2014 21:40:47 GMT
+  recorded_at: Mon, 09 Mar 2015 19:54:01 GMT
 - request:
     method: post
-    uri: http://localhost:8080/api/commands/create-repo
+    uri: http://localhost:8150/api/commands/create-repo
     body:
       encoding: UTF-8
-      string: '{"name":"single-quote with spaces''","url":"http://url.com/some.iso","task":"noop"}'
+      string: '{"name":"''single-quote with spaces''","url":"http://url.com/some.iso","task":"noop"}'
     headers:
       Accept:
       - application/json
@@ -905,7 +638,7 @@ http_interactions:
       Content-Type:
       - application/json
       Content-Length:
-      - '82'
+      - '83'
       User-Agent:
       - Ruby
   response:
@@ -920,18 +653,18 @@ http_interactions:
       Content-Type:
       - application/json;charset=utf-8
       Content-Length:
-      - '247'
+      - '249'
       Date:
-      - Wed, 21 May 2014 21:40:46 GMT
+      - Mon, 09 Mar 2015 19:54:01 GMT
     body:
       encoding: US-ASCII
-      string: '{"spec":"http://api.puppetlabs.com/razor/v1/collections/repos/member","id":"http://localhost:8080/api/collections/repos/single-quote%20with%20spaces''","name":"single-quote
-        with spaces''","command":"http://localhost:8080/api/collections/commands/3"}'
+      string: '{"spec":"http://api.puppetlabs.com/razor/v1/collections/repos/member","id":"http://localhost:8150/api/collections/repos/''single-quote%20with%20spaces''","name":"''single-quote
+        with spaces''","command":"http://localhost:8150/api/collections/commands/3"}'
     http_version:
-  recorded_at: Wed, 21 May 2014 21:40:47 GMT
+  recorded_at: Mon, 09 Mar 2015 19:54:01 GMT
 - request:
     method: get
-    uri: http://localhost:8080/api/collections/repos/single-quote%20with%20spaces'
+    uri: http://localhost:8150/api/collections/repos/'single-quote%20with%20spaces'
     body:
       encoding: US-ASCII
       string: ''
@@ -954,13 +687,13 @@ http_interactions:
       Content-Type:
       - application/json;charset=utf-8
       Content-Length:
-      - '381'
+      - '383'
       Date:
-      - Wed, 21 May 2014 21:40:46 GMT
+      - Mon, 09 Mar 2015 19:54:01 GMT
     body:
       encoding: US-ASCII
-      string: '{"spec":"http://api.puppetlabs.com/razor/v1/collections/repos/member","id":"http://localhost:8080/api/collections/repos/single-quote%20with%20spaces''","name":"single-quote
-        with spaces''","iso_url":null,"url":"http://url.com/some.iso","task":{"spec":"http://api.puppetlabs.com/razor/v1/collections/tasks/member","id":"http://localhost:8080/api/collections/tasks/noop","name":"noop"}}'
+      string: '{"spec":"http://api.puppetlabs.com/razor/v1/collections/repos/member","id":"http://localhost:8150/api/collections/repos/''single-quote%20with%20spaces''","name":"''single-quote
+        with spaces''","iso_url":null,"url":"http://url.com/some.iso","task":{"spec":"http://api.puppetlabs.com/razor/v1/collections/tasks/member","id":"http://localhost:8150/api/collections/tasks/noop","name":"noop"}}'
     http_version:
-  recorded_at: Wed, 21 May 2014 21:40:47 GMT
+  recorded_at: Mon, 09 Mar 2015 19:54:01 GMT
 recorded_with: VCR 2.5.0