knife-softlayer 0.4.5 → 0.4.6

data/Rakefile

@@ -1,37 +1,37 @@
-require "bundler/gem_tasks"
-
-require 'bundler'
-Bundler::GemHelper.install_tasks
-
-require 'rdoc/task'
-
-begin
-  require 'sdoc'
-  require 'rdoc/task'
-
-  RDoc::Task.new do |rdoc|
-    rdoc.title = "Chef Ruby API Documentation"
-    rdoc.main = "README.rdoc"
-    rdoc.options << '--fmt' << 'shtml' # explictly set shtml generator
-    rdoc.template = 'direct' # lighter template
-    rdoc.rdoc_files.include("README.rdoc", "LICENSE", "spec/tiny_server.rb", "lib/**/*.rb")
-    rdoc.rdoc_dir = "rdoc"
-  end
-rescue LoadError
-  puts "sdoc is not available. (sudo) gem install sdoc to generate rdoc documentation."
-end
-
-begin
-  require 'rspec/core/rake_task'
-
-  task :default => :spec
-
-  desc "Run all specs in spec directory"
-  RSpec::Core::RakeTask.new(:spec) do |t|
-    t.pattern = 'spec/unit/**/*_spec.rb'
-  end
-
-rescue LoadError
-  STDERR.puts "\n*** RSpec not available. (sudo) gem install rspec to run unit tests. ***\n\n"
-end
-
+require "bundler/gem_tasks"
+
+require 'bundler'
+Bundler::GemHelper.install_tasks
+
+require 'rdoc/task'
+
+begin
+  require 'sdoc'
+  require 'rdoc/task'
+
+  RDoc::Task.new do |rdoc|
+    rdoc.title = "Chef Ruby API Documentation"
+    rdoc.main = "README.rdoc"
+    rdoc.options << '--fmt' << 'shtml' # explictly set shtml generator
+    rdoc.template = 'direct' # lighter template
+    rdoc.rdoc_files.include("README.rdoc", "LICENSE", "spec/tiny_server.rb", "lib/**/*.rb")
+    rdoc.rdoc_dir = "rdoc"
+  end
+rescue LoadError
+  puts "sdoc is not available. (sudo) gem install sdoc to generate rdoc documentation."
+end
+
+begin
+  require 'rspec/core/rake_task'
+
+  task :default => :spec
+
+  desc "Run all specs in spec directory"
+  RSpec::Core::RakeTask.new(:spec) do |t|
+    t.pattern = 'spec/unit/**/*_spec.rb'
+  end
+
+rescue LoadError
+  STDERR.puts "\n*** RSpec not available. (sudo) gem install rspec to run unit tests. ***\n\n"
+end
+

data/docs/cla-corporate.md

@@ -1,133 +1,133 @@
- 
-#### International Business machines, Inc.
-#####Software Grant and Corporate Contributor License Agreement ("Agreement")
-
-http://www.github.org/softlayer/knife-softlayer/
-
-
-Thank you for your interest in IBM’s knife-softlayer project (“the
-Project"). In order to clarify the intellectual property license granted with Contributions from any person or entity, IBM must have a Contributor License Agreement (CLA) on file that has been signed by each Contributor, indicating agreement to the license terms
-below. This license is for your protection as a Contributor as well
-as the protection of IBM and its users; it does not change your rights to use your own Contributions for any other purpose.
-
-This version of the Agreement allows an entity (the "Corporation") to submit Contributions to the Project, to authorize Contributions 
-submitted by its designated employees to the Project, and to grant 
-copyright and patent licenses thereto 
-   
-If you have not already done so, please complete and sign, then scan and email a pdf file of this Agreement to pjackson@softlayer.com. 
-
-
-
-Please read this document carefully before signing and keep a copy for your records.
-
-Corporation name:    ________________________________________________
-      
-Corporation address: ________________________________________________                     
-
-Point of Contact:    ________________________________________________
-
-E-Mail:              ________________________________________________
-
-Telephone:           _____________________ 
-      
-
-You accept and agree to the following terms and conditions for Your
-present and future Contributions submitted to the Project. Except 
-for the license granted herein to IBM and recipients of software distributed by IBM, You reserve all right, title, and interest in and to Your Contributions.
-
-1. Definitions.
-
-   "You" (or "Your") shall mean the copyright owner or legal entity
-   authorized by the copyright owner that is making this Agreement
-   with IBM. For legal entities, the entity making a Contribution and    
-   all other entities that control, are controlled by, or are under 
-   common control with that entity are considered to be a single    
-   Contributor. 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.
-
-   "Contribution" shall mean the code, documentation or other original
-   works of authorship expressly identified in Schedule B, as well as
-   any original work of authorship, including any modifications or    
-additions to an existing work, that is intentionally submitted by You to IBM for inclusion in, or documentation of, the Project managed by IBM (the "Work"). For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to IBM 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, IBM for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by You as "Not a Contribution."
-
-2. Grant of Copyright License. Subject to the terms and conditions
-   of this Agreement, You hereby grant to IBM and to
-   recipients of software distributed by IBM 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
-   Your Contributions and such derivative works.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-   this Agreement, You hereby grant to IBM and to recipients
-   of software distributed by IBM 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 You that are necessarily infringed by Your Contribution(s)
-   alone or by combination of Your Contribution(s) with the Work to
-   which such Contribution(s) were submitted. If any entity institutes
-   patent litigation against You or any other entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that your
-   Contribution, or the Work to which you have contributed, constitutes
-   direct or contributory patent infringement, then any patent licenses
-   granted to that entity under this Agreement for that Contribution or
-   Work shall terminate as of the date such litigation is filed.
-
-4. You represent that You are legally entitled to grant the above
-   license. You represent further that each employee of the
-   Corporation designated on Schedule A below (or in a subsequent
-   written modification to that Schedule) is authorized to submit
-   Contributions on behalf of the Corporation.
-
-5. You represent that each of Your Contributions is Your original
-   creation (see section 7 for submissions on behalf of others).
-
-6. You are not expected to provide support for Your Contributions,
-   except to the extent You desire to provide support. You may provide
-   support for free, for a fee, or not at all. Unless required by
-   applicable law or agreed to in writing, You provide Your
-   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.
-
-7. Should You wish to submit work that is not Your original creation,
-   You may submit it to IBM separately from any
-   Contribution, identifying the complete details of its source and
-   of any license or other restriction (including, but not limited
-   to, related patents, trademarks, and license agreements) of which
-   you are personally aware, and conspicuously marking the work as
-   "Submitted on behalf of a third-party: [named here]".
-
-8. It is your responsibility to notify IBM when any change
-   is required to the list of designated employees authorized to submit
-   Contributions on behalf of the Corporation, or to the Corporation's
-   Point of Contact with IBM.
-
-
-
-Please sign: __________________________________ Date: _______________
-
-Title:       __________________________________
-
-Corporation: __________________________________
-
-
-Schedule A
-
-   [Initial list of designated employees.  NB: authorization is not
-    tied to particular Contributions.]
-
-
-
-
-Schedule B
-
-   [Identification of optional concurrent software grant.  Would be
-    left blank or omitted if there is no concurrent software grant.]
-
+ 
+#### International Business machines, Inc.
+#####Software Grant and Corporate Contributor License Agreement ("Agreement")
+
+http://www.github.org/softlayer/knife-softlayer/
+
+
+Thank you for your interest in IBM’s knife-softlayer project (“the
+Project"). In order to clarify the intellectual property license granted with Contributions from any person or entity, IBM must have a Contributor License Agreement (CLA) on file that has been signed by each Contributor, indicating agreement to the license terms
+below. This license is for your protection as a Contributor as well
+as the protection of IBM and its users; it does not change your rights to use your own Contributions for any other purpose.
+
+This version of the Agreement allows an entity (the "Corporation") to submit Contributions to the Project, to authorize Contributions 
+submitted by its designated employees to the Project, and to grant 
+copyright and patent licenses thereto 
+   
+If you have not already done so, please complete and sign, then scan and email a pdf file of this Agreement to pjackson@softlayer.com. 
+
+
+
+Please read this document carefully before signing and keep a copy for your records.
+
+Corporation name:    ________________________________________________
+      
+Corporation address: ________________________________________________                     
+
+Point of Contact:    ________________________________________________
+
+E-Mail:              ________________________________________________
+
+Telephone:           _____________________ 
+      
+
+You accept and agree to the following terms and conditions for Your
+present and future Contributions submitted to the Project. Except 
+for the license granted herein to IBM and recipients of software distributed by IBM, You reserve all right, title, and interest in and to Your Contributions.
+
+1. Definitions.
+
+   "You" (or "Your") shall mean the copyright owner or legal entity
+   authorized by the copyright owner that is making this Agreement
+   with IBM. For legal entities, the entity making a Contribution and    
+   all other entities that control, are controlled by, or are under 
+   common control with that entity are considered to be a single    
+   Contributor. 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.
+
+   "Contribution" shall mean the code, documentation or other original
+   works of authorship expressly identified in Schedule B, as well as
+   any original work of authorship, including any modifications or    
+additions to an existing work, that is intentionally submitted by You to IBM for inclusion in, or documentation of, the Project managed by IBM (the "Work"). For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to IBM 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, IBM for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by You as "Not a Contribution."
+
+2. Grant of Copyright License. Subject to the terms and conditions
+   of this Agreement, You hereby grant to IBM and to
+   recipients of software distributed by IBM 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
+   Your Contributions and such derivative works.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+   this Agreement, You hereby grant to IBM and to recipients
+   of software distributed by IBM 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 You that are necessarily infringed by Your Contribution(s)
+   alone or by combination of Your Contribution(s) with the Work to
+   which such Contribution(s) were submitted. If any entity institutes
+   patent litigation against You or any other entity (including a
+   cross-claim or counterclaim in a lawsuit) alleging that your
+   Contribution, or the Work to which you have contributed, constitutes
+   direct or contributory patent infringement, then any patent licenses
+   granted to that entity under this Agreement for that Contribution or
+   Work shall terminate as of the date such litigation is filed.
+
+4. You represent that You are legally entitled to grant the above
+   license. You represent further that each employee of the
+   Corporation designated on Schedule A below (or in a subsequent
+   written modification to that Schedule) is authorized to submit
+   Contributions on behalf of the Corporation.
+
+5. You represent that each of Your Contributions is Your original
+   creation (see section 7 for submissions on behalf of others).
+
+6. You are not expected to provide support for Your Contributions,
+   except to the extent You desire to provide support. You may provide
+   support for free, for a fee, or not at all. Unless required by
+   applicable law or agreed to in writing, You provide Your
+   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.
+
+7. Should You wish to submit work that is not Your original creation,
+   You may submit it to IBM separately from any
+   Contribution, identifying the complete details of its source and
+   of any license or other restriction (including, but not limited
+   to, related patents, trademarks, and license agreements) of which
+   you are personally aware, and conspicuously marking the work as
+   "Submitted on behalf of a third-party: [named here]".
+
+8. It is your responsibility to notify IBM when any change
+   is required to the list of designated employees authorized to submit
+   Contributions on behalf of the Corporation, or to the Corporation's
+   Point of Contact with IBM.
+
+
+
+Please sign: __________________________________ Date: _______________
+
+Title:       __________________________________
+
+Corporation: __________________________________
+
+
+Schedule A
+
+   [Initial list of designated employees.  NB: authorization is not
+    tied to particular Contributions.]
+
+
+
+
+Schedule B
+
+   [Identification of optional concurrent software grant.  Would be
+    left blank or omitted if there is no concurrent software grant.]
+

data/docs/cla-individual.md

@@ -1,84 +1,84 @@
-#### International Business Machines, Inc. (IBM)
-#####Individual Contributor License Agreement ("Agreement")
-            
-http://www.github.com/softlayer/knife-softlayer
-
-Thank you for your interest in the knife-softlayer project ("the Project").
-
-In order to clarify the intellectual property license granted with Contributions from any person or entity, IBM must have a Contributor License Agreement ("CLA") on file that has been signed by each Contributor, indicating agreement to the license terms below. This license is for your protection as a Contributor as well as the protection of IBM and its customers; it does not change your rights to use your own Contributions for any other purpose.
-
-If you have not already done so, please complete and sign, then scan and email a pdf file of this Agreement to pjackson@softlayer.com
-
-Please read this document carefully before signing and keep a copy for your records.
-
-  Full name: ______________________________________________________
-
-  (optional) Public name: _________________________________________
-
-  Mailing Address: ________________________________________________                
-
-  Country:   ______________________________________________________
-
-  Telephone: ______________________________________________________
-
-  E-Mail:    ______________________________________________________
-
-
-You accept and agree to the following terms and conditions for Your present and future Contributions submitted to the Project. Except for the license granted herein to IBM and recipients of software distributed by IBM, You reserve all right, title, and interest in and to Your Contributions.
-
-1. Definitions.
-
-   "You" (or "Your") shall mean the copyright owner or legal entity
-   authorized by the copyright owner that is making this Agreement
-with IBM. For legal entities, the entity making a Contribution and all other entities that control, are controlled by, or are under common control with that entity are considered to be a single Contributor. 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.
-
-   "Contribution" shall mean any original work of authorship,
-   including any modifications or additions to an existing work, that
-   is intentionally submitted by You to the Project for inclusion
-in, or documentation of, the Project (”the Work”). For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Project 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 Project for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by You as "Not a Contribution."
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-this Agreement, You hereby grant to IBM and to recipients of software distributed by IBM 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 Your Contributions and such derivative works.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-this Agreement, You hereby grant to IBM and to recipients of software distributed by IBM 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 to which Your Contribution(s) were submitted, where such license applies only to those patent claims licensable by You that are necessarily infringed by Your Contribution(s) alone or by combination of Your Contribution(s) with the Work to which such Contribution(s) was submitted. If any entity institutes patent litigation against You or any other entity (including a cross-claim or counterclaim in a lawsuit) alleging that your Contribution, or the Work to which you have contributed, constitutes direct or contributory patent infringement, then any patent licenses granted to that entity under this Agreement for that Contribution or Work shall terminate as of the date such litigation is filed.
-
-4. You represent that you are legally entitled to grant the above
-   license. If your employer(s) has rights to intellectual property
-   that you create that includes your Contributions, you represent
-   that you have received permission to make Contributions on behalf
-   of that employer, that your employer has waived such rights for
-   your Contributions to the Project, or that your employer has
-   executed a separate Corporate CLA with IBM.
-
-5. You represent that each of Your Contributions is Your original
-   creation (see section 7 for submissions on behalf of others).  You
-   represent that Your Contribution submissions include complete
-   details of any third-party license or other restriction (including,
-   but not limited to, related patents and trademarks) of which you
-   are personally aware and which are associated with any part of Your
-   Contributions.
-
-6. You are not expected to provide support for Your Contributions,
-   except to the extent You desire to provide support. You may provide
-   support for free, for a fee, or not at all. Unless required by
-   applicable law or agreed to in writing, You provide Your
-   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.
-
-7. Should You wish to submit work that is not Your original creation,
-   You may submit it to the Project separately from any
-   Contribution, identifying the complete details of its source and of
-   any license or other restriction (including, but not limited to,
-   related patents, trademarks, and license agreements) of which you
-   are personally aware, and conspicuously marking the work as
-   "Submitted on behalf of a third-party: [named here]".
-
-8. You agree to notify IBM of any facts or circumstances of
-   which you become aware that would make these representations
-   inaccurate in any respect.
-
-Please sign: __________________________________ Date: ________________
-
+#### International Business Machines, Inc. (IBM)
+#####Individual Contributor License Agreement ("Agreement")
+            
+http://www.github.com/softlayer/knife-softlayer
+
+Thank you for your interest in the knife-softlayer project ("the Project").
+
+In order to clarify the intellectual property license granted with Contributions from any person or entity, IBM must have a Contributor License Agreement ("CLA") on file that has been signed by each Contributor, indicating agreement to the license terms below. This license is for your protection as a Contributor as well as the protection of IBM and its customers; it does not change your rights to use your own Contributions for any other purpose.
+
+If you have not already done so, please complete and sign, then scan and email a pdf file of this Agreement to pjackson@softlayer.com
+
+Please read this document carefully before signing and keep a copy for your records.
+
+  Full name: ______________________________________________________
+
+  (optional) Public name: _________________________________________
+
+  Mailing Address: ________________________________________________                
+
+  Country:   ______________________________________________________
+
+  Telephone: ______________________________________________________
+
+  E-Mail:    ______________________________________________________
+
+
+You accept and agree to the following terms and conditions for Your present and future Contributions submitted to the Project. Except for the license granted herein to IBM and recipients of software distributed by IBM, You reserve all right, title, and interest in and to Your Contributions.
+
+1. Definitions.
+
+   "You" (or "Your") shall mean the copyright owner or legal entity
+   authorized by the copyright owner that is making this Agreement
+with IBM. For legal entities, the entity making a Contribution and all other entities that control, are controlled by, or are under common control with that entity are considered to be a single Contributor. 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.
+
+   "Contribution" shall mean any original work of authorship,
+   including any modifications or additions to an existing work, that
+   is intentionally submitted by You to the Project for inclusion
+in, or documentation of, the Project (”the Work”). For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Project 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 Project for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by You as "Not a Contribution."
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+this Agreement, You hereby grant to IBM and to recipients of software distributed by IBM 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 Your Contributions and such derivative works.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+this Agreement, You hereby grant to IBM and to recipients of software distributed by IBM 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 to which Your Contribution(s) were submitted, where such license applies only to those patent claims licensable by You that are necessarily infringed by Your Contribution(s) alone or by combination of Your Contribution(s) with the Work to which such Contribution(s) was submitted. If any entity institutes patent litigation against You or any other entity (including a cross-claim or counterclaim in a lawsuit) alleging that your Contribution, or the Work to which you have contributed, constitutes direct or contributory patent infringement, then any patent licenses granted to that entity under this Agreement for that Contribution or Work shall terminate as of the date such litigation is filed.
+
+4. You represent that you are legally entitled to grant the above
+   license. If your employer(s) has rights to intellectual property
+   that you create that includes your Contributions, you represent
+   that you have received permission to make Contributions on behalf
+   of that employer, that your employer has waived such rights for
+   your Contributions to the Project, or that your employer has
+   executed a separate Corporate CLA with IBM.
+
+5. You represent that each of Your Contributions is Your original
+   creation (see section 7 for submissions on behalf of others).  You
+   represent that Your Contribution submissions include complete
+   details of any third-party license or other restriction (including,
+   but not limited to, related patents and trademarks) of which you
+   are personally aware and which are associated with any part of Your
+   Contributions.
+
+6. You are not expected to provide support for Your Contributions,
+   except to the extent You desire to provide support. You may provide
+   support for free, for a fee, or not at all. Unless required by
+   applicable law or agreed to in writing, You provide Your
+   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.
+
+7. Should You wish to submit work that is not Your original creation,
+   You may submit it to the Project separately from any
+   Contribution, identifying the complete details of its source and of
+   any license or other restriction (including, but not limited to,
+   related patents, trademarks, and license agreements) of which you
+   are personally aware, and conspicuously marking the work as
+   "Submitted on behalf of a third-party: [named here]".
+
+8. You agree to notify IBM of any facts or circumstances of
+   which you become aware that would make these representations
+   inaccurate in any respect.
+
+Please sign: __________________________________ Date: ________________
+