Permalink
Browse files

Merge github.com:railsmachine/rump into railsmachine

  • Loading branch information...
2 parents b60fe27 + 1031a42 commit 321c570d17e8cf2ed4a7f4e5ca8ef7eefe29c89b @auxesis auxesis committed Apr 26, 2011
Showing with 190 additions and 34 deletions.
  1. +0 −1 LICENCE
  2. +165 −0 LICENSE
  3. +23 −31 README.md
  4. +1 −1 Rakefile
  5. +1 −1 man/rump.1.ronn
View
@@ -1 +0,0 @@
-All code copyright RailsMachine LLC 2010.
View
165 LICENSE
@@ -0,0 +1,165 @@
+ GNU LESSER GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+ This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+ 0. Additional Definitions.
+
+ As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+ "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+ An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+ A "Combined Work" is a work produced by combining or linking an
+Application with the Library. The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+ The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+ The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+ 1. Exception to Section 3 of the GNU GPL.
+
+ You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+ 2. Conveying Modified Versions.
+
+ If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+ a) under this License, provided that you make a good faith effort to
+ ensure that, in the event an Application does not supply the
+ function or data, the facility still operates, and performs
+ whatever part of its purpose remains meaningful, or
+
+ b) under the GNU GPL, with none of the additional permissions of
+ this License applicable to that copy.
+
+ 3. Object Code Incorporating Material from Library Header Files.
+
+ The object code form of an Application may incorporate material from
+a header file that is part of the Library. You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+ a) Give prominent notice with each copy of the object code that the
+ Library is used in it and that the Library and its use are
+ covered by this License.
+
+ b) Accompany the object code with a copy of the GNU GPL and this license
+ document.
+
+ 4. Combined Works.
+
+ You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+ a) Give prominent notice with each copy of the Combined Work that
+ the Library is used in it and that the Library and its use are
+ covered by this License.
+
+ b) Accompany the Combined Work with a copy of the GNU GPL and this license
+ document.
+
+ c) For a Combined Work that displays copyright notices during
+ execution, include the copyright notice for the Library among
+ these notices, as well as a reference directing the user to the
+ copies of the GNU GPL and this license document.
+
+ d) Do one of the following:
+
+ 0) Convey the Minimal Corresponding Source under the terms of this
+ License, and the Corresponding Application Code in a form
+ suitable for, and under terms that permit, the user to
+ recombine or relink the Application with a modified version of
+ the Linked Version to produce a modified Combined Work, in the
+ manner specified by section 6 of the GNU GPL for conveying
+ Corresponding Source.
+
+ 1) Use a suitable shared library mechanism for linking with the
+ Library. A suitable mechanism is one that (a) uses at run time
+ a copy of the Library already present on the user's computer
+ system, and (b) will operate properly with a modified version
+ of the Library that is interface-compatible with the Linked
+ Version.
+
+ e) Provide Installation Information, but only if you would otherwise
+ be required to provide such information under section 6 of the
+ GNU GPL, and only to the extent that such information is
+ necessary to install and execute a modified version of the
+ Combined Work produced by recombining or relinking the
+ Application with a modified version of the Linked Version. (If
+ you use option 4d0, the Installation Information must accompany
+ the Minimal Corresponding Source and Corresponding Application
+ Code. If you use option 4d1, you must provide the Installation
+ Information in the manner specified by section 6 of the GNU GPL
+ for conveying Corresponding Source.)
+
+ 5. Combined Libraries.
+
+ You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+ a) Accompany the combined library with a copy of the same work based
+ on the Library, uncombined with any other library facilities,
+ conveyed under the terms of this License.
+
+ b) Give prominent notice with the combined library that part of it
+ is a work based on the Library, and explaining where to find the
+ accompanying uncombined form of the same work.
+
+ 6. Revised Versions of the GNU Lesser General Public License.
+
+ The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+ If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
View
@@ -3,7 +3,7 @@ Rump
Rump helps you run Puppet locally against a Git checkout.
-Rump supports a Puppet workflow where you quickly + iteratively develop your
+Rump encourages a Puppet workflow where you quickly + iteratively develop your
Puppet manifests on a single machine, then push your changes up to a repository
to deploy to the rest of your infrastructure.
@@ -16,24 +16,15 @@ letting you quickly test different versions of Puppet without waiting for
packages to appear, and reducing the dependencies on a system to run Puppet
down to just Ruby and git.
-Installing dependencies
------------------------
-
-On the server you're configuring with Puppet, run:
-
- $ sudo aptitude install puppet git-core
-
-Make sure your hostname is set:
-
- $ sudo vi /etc/hostname
- foo.bar.example.org
- $ sudo hostname -F /etc/hostname
+Installing
+----------
+ $ gem install rump
Using Rump
----------
-Make sure you check out the [man pages](blob/master/man/rump.1.ronn).
+Make sure you check out the [man pages](rump/blob/master/man/rump.1.ronn).
Check out your repository of Puppet manifests:
@@ -43,22 +34,6 @@ Now `cd` into the directory, and do a Puppet run:
$ sudo rump go
-There's nothing stopping you from running Rump against different checkouts/branches
-of manifests. This is especially powerful when developing locally with the following
-workflow:
-
- 1. `rump clone git@github.com:me_at_example_dot_org/puppet.git`
- 2. `rump go`
- 3. `cd puppet && git checkout -b new_feature`
- 4. Make your changes &amp;&amp; `rump go`
- 5. *Iterate until everything's working*
- 6. `git checkout master && git merge new_feature`
- 7. `git push`
-
-
-Running Puppet
---------------
-
When you make changes, run Puppet through Rump:
$ sudo rump go
@@ -68,6 +43,19 @@ of `rump go`:
$ sudo rump go --verbose --debug --noop
+There's nothing stopping you from running Rump against different checkouts/branches
+of manifests. This is especially powerful when developing locally with the following
+workflow:
+
+ 1. `rump clone git@github.com:me_at_example_dot_org/puppet.git`
+ 2. `rump go`
+ 3. `cd puppet && git checkout -b new_feature`
+ 4. Make your changes &amp;&amp; `rump go --noop` to see what will change.
+ 5. Apply the changes with `rump go`
+ 6. *Iterate until everything's working*
+ 7. `git checkout master && git merge new_feature`
+ 8. `git push`
+
Freezing Puppet
---------------
@@ -127,7 +115,6 @@ the test requires internet connectivity. Run all but `@online` tests with:
$ cucumber --tags ~@online features/
-
Quirks
------
@@ -137,3 +124,8 @@ Quirks
2. Manifests need to be in modules so Puppet can pick them up correctly.
+License
+-------
+
+Copyright Rails Machine LLC 2010-2011, released under the LGPL. See
+[LICENSE](rump/blob/master/LICENSE) for more info.
View
@@ -4,7 +4,7 @@ begin
gemspec.name = "rump"
gemspec.summary = "Rump helps you run Puppet locally against a Git checkout."
gemspec.description = "Rump helps you run Puppet locally against a Git checkout. This is great for locally iterating your Puppet manifests very quickly, then pushng them up to a repository somewhere else to share the changes."
- gemspec.email = "lindsay@railsmachine.com"
+ gemspec.email = "ops@railsmachine.com"
gemspec.homepage = "http://github.com/railsmachine/rump"
gemspec.authors = ["Lindsay Holmwood"]
gemspec.add_dependency 'thor', '0.13.4'
View
@@ -207,7 +207,7 @@ Lindsay Holmwood <lindsay@holmwood.id.au>
## COPYRIGHT ##
-Rump is copyright Rails Machine LLC.
+Copyright Rails Machine LLC 2010-2011, released under the LGPL
## SEE ALSO ##

0 comments on commit 321c570

Please sign in to comment.