From 7b9ec37350073eecbfc2c08c17db99d5a1dfbf7d Mon Sep 17 00:00:00 2001 From: Seth Vargo Date: Sat, 20 Jul 2013 16:03:33 -0400 Subject: [PATCH] Move to require_relative to make Windows faster --- .ruby-version | 2 +- LICENSE | 191 +++++++++++++++++++- lib/berkshelf/extensions.rb | 19 +- lib/berkshelf/extensions/cached_cookbook.rb | 17 ++ lib/strainer.rb | 38 ++-- lib/strainer/cli.rb | 18 ++ lib/strainer/command.rb | 17 ++ lib/strainer/errors.rb | 17 ++ lib/strainer/rake_task.rb | 20 +- lib/strainer/runner.rb | 17 ++ lib/strainer/sandbox.rb | 17 ++ lib/strainer/strainerfile.rb | 17 ++ lib/strainer/thor.rb | 19 +- lib/strainer/ui.rb | 17 ++ lib/strainer/version.rb | 20 +- 15 files changed, 428 insertions(+), 18 deletions(-) diff --git a/.ruby-version b/.ruby-version index df28eb5..c82eec7 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -1.9.3-p429 +1.9.3-p448 diff --git a/LICENSE b/LICENSE index db5fc4e..1c62059 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,193 @@ -Copyright 2012 Seth Vargo, CustomInk, LLC + 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 2013 Seth Vargo +Copyright 2013 CustomInk, LLC Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/lib/berkshelf/extensions.rb b/lib/berkshelf/extensions.rb index 4e51a2f..0e84831 100644 --- a/lib/berkshelf/extensions.rb +++ b/lib/berkshelf/extensions.rb @@ -1 +1,18 @@ -require 'berkshelf/extensions/cached_cookbook' +# +# Copyright 2013, Seth Vargo +# Copyright 2013, CustomInk, LLC +# +# 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. +# + +require_relative 'extensions/cached_cookbook' diff --git a/lib/berkshelf/extensions/cached_cookbook.rb b/lib/berkshelf/extensions/cached_cookbook.rb index 526d6ba..19b30c1 100644 --- a/lib/berkshelf/extensions/cached_cookbook.rb +++ b/lib/berkshelf/extensions/cached_cookbook.rb @@ -1,3 +1,20 @@ +# +# Copyright 2013, Seth Vargo +# Copyright 2013, CustomInk, LLC +# +# 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. +# + module Berkshelf # Extensions on Berkshelf::CachedCookbook # diff --git a/lib/strainer.rb b/lib/strainer.rb index 9a7925a..567a529 100644 --- a/lib/strainer.rb +++ b/lib/strainer.rb @@ -1,20 +1,26 @@ +# +# Copyright 2013, Seth Vargo +# Copyright 2013, CustomInk, LLC +# +# 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. +# + require 'berkshelf' -require 'berkshelf/extensions' require 'celluloid' require 'pathname' require 'thor' -require 'strainer/errors' -require 'strainer/ui' - module Strainer - autoload :Cli, 'strainer/cli' - autoload :Command, 'strainer/command' - autoload :Runner, 'strainer/runner' - autoload :Sandbox, 'strainer/sandbox' - autoload :Strainerfile, 'strainer/strainerfile' - autoload :Version, 'strainer/version' - class << self # The root of the application. # @@ -86,3 +92,13 @@ def logfile_path # Sync STDOUT to get "real-time" output STDOUT.sync = true + +require_relative 'berkshelf/extensions' +require_relative 'strainer/cli' +require_relative 'strainer/command' +require_relative 'strainer/errors' +require_relative 'strainer/runner' +require_relative 'strainer/sandbox' +require_relative 'strainer/strainerfile' +require_relative 'strainer/ui' +require_relative 'strainer/version' diff --git a/lib/strainer/cli.rb b/lib/strainer/cli.rb index 01510b3..a12b1e7 100644 --- a/lib/strainer/cli.rb +++ b/lib/strainer/cli.rb @@ -1,4 +1,22 @@ +# +# Copyright 2013, Seth Vargo +# Copyright 2013, CustomInk, LLC +# +# 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. +# + require 'strainer' +require_relative 'strainerfile' module Strainer # Cli runner for Strainer diff --git a/lib/strainer/command.rb b/lib/strainer/command.rb index 33be736..5838f48 100644 --- a/lib/strainer/command.rb +++ b/lib/strainer/command.rb @@ -1,3 +1,20 @@ +# +# Copyright 2013, Seth Vargo +# Copyright 2013, CustomInk, LLC +# +# 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. +# + require 'pty' module Strainer diff --git a/lib/strainer/errors.rb b/lib/strainer/errors.rb index df1c0a9..ebe1d63 100644 --- a/lib/strainer/errors.rb +++ b/lib/strainer/errors.rb @@ -1,3 +1,20 @@ +# +# Copyright 2013, Seth Vargo +# Copyright 2013, CustomInk, LLC +# +# 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. +# + module Strainer module Error # Base class for our custom errors to inherit from. diff --git a/lib/strainer/rake_task.rb b/lib/strainer/rake_task.rb index d2edb26..9e46752 100644 --- a/lib/strainer/rake_task.rb +++ b/lib/strainer/rake_task.rb @@ -1,6 +1,24 @@ +# +# Copyright 2013, Seth Vargo +# Copyright 2013, CustomInk, LLC +# +# 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. +# + require 'rake' require 'rake/tasklib' -require 'strainer/cli' + +require_relative 'cli' module Strainer # Run Strainer from rake diff --git a/lib/strainer/runner.rb b/lib/strainer/runner.rb index 039603f..9fdc781 100644 --- a/lib/strainer/runner.rb +++ b/lib/strainer/runner.rb @@ -1,3 +1,20 @@ +# +# Copyright 2013, Seth Vargo +# Copyright 2013, CustomInk, LLC +# +# 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. +# + module Strainer # The Runner class is responsible for executing the tests against cookbooks. # diff --git a/lib/strainer/sandbox.rb b/lib/strainer/sandbox.rb index 132e6bf..f1bb7f3 100644 --- a/lib/strainer/sandbox.rb +++ b/lib/strainer/sandbox.rb @@ -1,3 +1,20 @@ +# +# Copyright 2013, Seth Vargo +# Copyright 2013, CustomInk, LLC +# +# 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. +# + module Strainer # Manages the Strainer sandbox (playground) for isolated testing. # diff --git a/lib/strainer/strainerfile.rb b/lib/strainer/strainerfile.rb index 0dd9e54..092590e 100644 --- a/lib/strainer/strainerfile.rb +++ b/lib/strainer/strainerfile.rb @@ -1,3 +1,20 @@ +# +# Copyright 2013, Seth Vargo +# Copyright 2013, CustomInk, LLC +# +# 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. +# + module Strainer # An instance of a Strainerfile. # diff --git a/lib/strainer/thor.rb b/lib/strainer/thor.rb index 00a41df..2f045bc 100644 --- a/lib/strainer/thor.rb +++ b/lib/strainer/thor.rb @@ -1,4 +1,21 @@ -require 'strainer/cli' +# +# Copyright 2013, Seth Vargo +# Copyright 2013, CustomInk, LLC +# +# 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. +# + +require_relative 'cli' module Strainer Thor = Cli diff --git a/lib/strainer/ui.rb b/lib/strainer/ui.rb index 03b8edc..af9b571 100644 --- a/lib/strainer/ui.rb +++ b/lib/strainer/ui.rb @@ -1,3 +1,20 @@ +# +# Copyright 2013, Seth Vargo +# Copyright 2013, CustomInk, LLC +# +# 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. +# + require 'thor' module Strainer diff --git a/lib/strainer/version.rb b/lib/strainer/version.rb index c38af62..04510e1 100644 --- a/lib/strainer/version.rb +++ b/lib/strainer/version.rb @@ -1,4 +1,20 @@ +# +# Copyright 2013, Seth Vargo +# Copyright 2013, CustomInk, LLC +# +# 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. +# + module Strainer - # The current version of Strainer - VERSION = '3.0.4' + VERSION = '3.0.5' end