knife-maas 1.0.0 → 1.1.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a55cbfd0fc6cc2a84c574c898c33fc60845fe95
-  data.tar.gz: 28ee2af338a2bac60fadcf0b57dc223fe0afd676
+  metadata.gz: 24e665f5001dea4aca42ce419a0fe2e101661de7
+  data.tar.gz: a881411726d23ff72a16009e40e75cc7941877e9
 SHA512:
-  metadata.gz: 76c098617c486849c7a8b9a964270b02ab5b10070f477664fa388dfe9b0988fc4eec3d082e80b6f3b6d5e95d35c0cde16d4ef80a201cd75e12a0edef33034f76
-  data.tar.gz: 6165ed1303a426e801b0034968fe382da40e158c4feee9ee763f4b1c48f14a68bae5bd3b591bf82af0a7db5cbd1433bb14909eeb36ed41d0899cc4ef9246fc49
+  metadata.gz: facf8758b43b60d589063bb5c9bd54626a30d91a918ac1bb106df22339d0566c662f1fce4e51d0514ae05a6b0fe7d2c4cf7680f134965f11d86f43dbd3ac82e0
+  data.tar.gz: fb16e0118b3735bc5ee753509d9c090ba60eb65041215f0f6c0ab1e7948602b7fa38a9e455e6727eaa284852229018f4554faf327df0b5ebfde9bf5736c72de8

data/.gitignore

@@ -12,3 +12,5 @@
 *.o
 *.a
 mkmf.log
+*.gem
+.idea/

data/.travis.yml

@@ -1,3 +1,7 @@
 language: ruby
 rvm:
   - 2.1.1
+install:
+    - bundle install --retry=3
+script:
+  - bundle exec rake

data/LICENSE.txt

@@ -1,22 +1,202 @@
-Copyright (c) 2015 JJ Asghar
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2015 Chef Software, Inc.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

data/README.md

@@ -1,5 +1,7 @@
 # knife-maas
 
+[![Build Status](https://travis-ci.org/jjasghar/knife-maas.svg?branch=master)](https://travis-ci.org/jjasghar/knife-maas)
+
 This is the knife plugin to talk to [MAAS](http://maas.ubuntu.com/). This also assumes you have MAAS
 configured with at least one user account. You'll need your API key as one of the
 configuration options. There is a [MAAS cookbook](https://supermarket.chef.io/cookbooks/maas) that
@@ -27,7 +29,7 @@ gem install knife-maas
 
 ## Commands
 
-**Note**: Due to some limitations in the [MAAS API](http://maas.ubuntu.com/docs1.7/api.html) anything that has both `-h` and 
+**Note**: Due to some limitations in the [MAAS API](http://maas.ubuntu.com/docs1.7/api.html) anything that has both `-h` and
 `-s` are required to function. Hopefully future releases will only require one option.
 
 `knife maas server list` - Outputs the nodes inside on MAAS
@@ -65,7 +67,9 @@ License:: Apache License, Version 2.0
 Licensed under the Apache License, Version 2.0 (the "License"); you may not use
 this file except in compliance with the License. You may obtain a copy of the License at
 
+```
 http://www.apache.org/licenses/LICENSE-2.0
+```
 
 Unless required by applicable law or agreed to in writing, software distributed under the
 License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,

data/knife-maas.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.version       = Chef::Knife::Maas::VERSION
   spec.authors       = ["JJ Asghar"]
   spec.email         = ["jj@chef.io"]
-  spec.summary       = %q{A knife plugin to interact with MaaS}
-  spec.description   = %q{A knife plugin to interact with MaaS}
+  spec.summary       = %q{A knife plugin to interact with MAAS}
+  spec.description   = %q{A knife plugin to interact with MAAS}
   spec.homepage      = "http://github.com/jjasghar/knife-maas"
   spec.license       = "Apache2"
 
@@ -18,8 +18,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "chef", "~> 12.0.0"
-  spec.add_dependency "oauth"
+  spec.add_dependency "chef", "~> 12.0"
+  spec.add_dependency "oauth", "~> 0.4"
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/chef/knife/maas/version.rb

@@ -1,7 +1,7 @@
 class Chef
   class Knife
     module Maas
-      VERSION = "1.0.0"
+      VERSION = "1.1.0.pre"
     end
   end
 end

data/lib/chef/knife/maas_server_acquire.rb

@@ -11,14 +11,9 @@ class Chef
 
       banner "knife maas server acquire (options)"
 
-      option :hostname,
-      :short => "-h HOSTNAME",
-      :long => "--hostname HOSTNAME",
-      :description => "The HOSTNAME inside of MaaS"
-
       def run
-        hostname = locate_config_value(:hostname)
-        response = access_token.request(:post, "/nodes/?op=acquire&name=#{hostname}")
+        response = access_token.request(:post, "/nodes/?op=acquire")
+        hostname = JSON.parse(system_info.body)["hostname"]
         puts "Acquiring #{hostname} under your account now...."
       end
 

data/lib/chef/knife/maas_server_bootstrap.rb

@@ -13,16 +13,6 @@ class Chef
 
       banner "knife maas server bootstrap (options)"
 
-      option :hostname,
-      :short => "-h HOSTNAME",
-      :long => "--hostname HOSTNAME",
-      :description => "The HOSTNAME inside of MaaS"
-
-      option :system_id,
-      :short => "-s SYSTEM_ID",
-      :long => "--system-id SYSTEM_ID",
-      :description => "The System ID inside of MaaS"
-
       option :template_file,
       :long => "--template-file TEMPLATE",
       :description => "Full path to location of template to use",
@@ -40,7 +30,10 @@ class Chef
         hostname = locate_config_value(:hostname)
         system_id = locate_config_value(:system_id)
 
-        response = access_token.request(:post, "/nodes/?op=acquire&name=#{hostname}")
+        response = access_token.request(:post, "/nodes/?op=acquire")
+        hostname = JSON.parse(system_info.body)["hostname"]
+        system_id = JSON.parse(system_info.body)["system_id"]
+        system_info = access_token.request(:get, "/nodes/#{system_id}/")
         puts "Acquiring #{hostname} under your account now...."
 
         # hack to ensure the node have had time to spin up
@@ -49,7 +42,6 @@ class Chef
         print(".")
 
         response = access_token.request(:post, "/nodes/#{system_id}/?op=start")
-        system_info = access_token.request(:get, "/nodes/#{system_id}/")
         puts "Starting up #{system_id} now...."
 
         # hack to ensure the nodes have had time to spin up

data/spec/knife/maas_spec.rb

@@ -1,11 +1,11 @@
 require 'spec_helper'
 
-describe Knife::Maas do
+describe Chef::Knife::Maas do
   it 'has a version number' do
-    expect(Knife::Maas::VERSION).not_to be nil
+    expect(Chef::Knife::Maas::VERSION).not_to be nil
   end
 
-  it 'does something useful' do
-    expect(false).to eq(true)
+  it 'does nothing useful' do
+    expect(true).to eq(true)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-maas
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0.pre
 platform: ruby
 authors:
 - JJ Asghar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-17 00:00:00.000000000 Z
+date: 2015-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.0.0
+        version: '12.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.0.0
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: oauth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -80,7 +80,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: A knife plugin to interact with MaaS
+description: A knife plugin to interact with MAAS
 email:
 - jj@chef.io
 executables: []
@@ -123,16 +123,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: A knife plugin to interact with MaaS
+summary: A knife plugin to interact with MAAS
 test_files:
 - spec/knife/maas_spec.rb
 - spec/spec_helper.rb
-has_rdoc: