deployflow 0.0.3 → 0.0.4

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2011 Nickolas Means
+Copyright (c) 2011 Nickolas Means / ActiveProspect, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.markdown

@@ -1,73 +1,93 @@
 deployflow
 ==========
 
-deployflow lets you use git-flow to release into a 'staging' branch and then promote specific 
-tags into your 'master' branch for deploying to production. It's for those of us who are
-persnickety about keeping master as a canonical repository of what's actually running in 
-production and doing all our mucking about elsewhere.
+deployflow lets you use git-flow (or any git tag-based versioning strategy, really) 
+to release into a 'staging' branch and then promote specific tags into your 'master'
+branch for deploying to production. It's for those of us who are persnickety about
+keeping 'master' as a canonical repository of what's actually running in production 
+and doing all our mucking about elsewhere.
+
 
 Installation
 ------------
 
-1. git-flow
-
-I'd recommend you use my custom fork of git-flow with deployflow. It adds
-version number auto-incrementation and suppresses the need to add a message
-to each tag you create. You can install it by:
+1.  git-flow
 
-`brew uninstall git-flow` (if you've previously installed git-flow via Homebrew)
-`git clone --recursive git://github.com/nmeans/gitflow.git`
-`cd gitflow`
-`make install` (or `sudo make install` if you don't own `/usr/local/bin`)
+    I'd recommend you use my custom fork of git-flow with deployflow. It adds
+    version number auto-incrementation and suppresses the need to add a message
+    to each tag you create. You can install it by:
 
-If you'd prefer the original, visit [http://github.com/nvie/gitflow](http://github.com/nvie/gitflow)
-for install information.
+    `brew uninstall git-flow` (if you've previously installed git-flow via Homebrew)  
+    `git clone --recursive git://github.com/nmeans/gitflow.git`  
+    `cd gitflow`  
+    `make install` (or `sudo make install` if you don't own `/usr/local/bin`)  
 
-2. Capistrano Multistage
+    If you'd prefer the original, visit [http://github.com/nvie/gitflow](http://github.com/nvie/gitflow)
+    for install information.
 
-`gem install capistrano-ext`
+2.  deployflow 
 
-3. deployflow
+    `gem install deployflow`  
+    This will also install capistrano and capistrano-ext if you don't already have them.
 
-It's as simple as:
-`gem install deployflow`
 
 Repository Setup
 ----------------
 
-1. Add a few branches to your repo
+1.  Add a couple of require branches to your repo
+
+    If you don't already have them, you'll need to add `develop` and `staging` branches. You should have a `master` branch by default. eg:
+
+    `git branch develop`  
+    `git branch staging`  
+
+2.  Run `git flow init` on your repo
+
+    You'll want to use `staging` as your branch for production releases (contradictory, I know, but trust me)
+    and `develop` for next release development. eg:
+
+        [~/Projects/deployflow-test]$ git flow init
 
-If you don't already have them, you'll need to add `develop` and `staging` branches. You should have a `master` branch by default.
+        Which branch should be used for bringing forth production releases?
+          - develop
+          - master
+          - staging
+        Branch name for production releases: [master] staging
 
-2. Run git flow init on your repo
+        Which branch should be used for integration of the "next release"?
+          - develop
+          - master
+        Branch name for "next release" development: [develop] develop
+    
 
-You'll want to use `staging` as your branch for production releases and `develop` for next release development
+3.  Add the following to the top of your config/deploy.rb
 
-3. Add the following to the top of your config/deploy.rb
+    `require 'capistrano/ext/multistage'`  
+    `require 'capistrano/deployflow'`  
 
-  require 'capistrano/ext/multistage'
-  require 'capistrano/deployflow'
 
 Usage
 -----
 
-Just use git-flow like normal. Create a release you want to deploy with `git flow release` or `git flow hotfix`.
+Just use git-flow like normal. (What is 'normal'? 
+[Here's a good primer.](http://jeffkreeftmeijer.com/2010/why-arent-you-using-git-flow/)) 
+Create a release you want to deploy with `git flow release` or `git flow hotfix`.
 
 When you're ready to deploy your release to staging, no need to push first, just run `cap staging deploy` and
 deployflow will automatically push to origin and deploy your most recent tag to staging.
 
 After you've tested in staging, you're ready to promote your tag to master and roll it out to production. All
 you have to do is `cap production deploy`, and deployflow will ask which tag you'd like to promote (suggesting
-your most recent automatically), merge that tag over to your master branch, push to origin, and deploy the head
-of your master branch to production.
+your most recent automatically), merge that tag over to your master branch, push to origin, and deploy that tag 
+to production.
 
 Credits
 -------
 
-Heavily inspired by Josh Nichols' [capistrano-gitflow](https://github.com/technicalpickles/capistrano-gitflow)
+Heavily inspired by and some code from Josh Nichols' [capistrano-gitflow](https://github.com/technicalpickles/capistrano-gitflow),
+which was in turn inspired by Alan Pinstein's [git-deployment](https://github.com/apinstein/git-deployment).
 
 Copyright
 ---------
 
-Copyright (c) 2011 Nickolas Means. See LICENSE.txt for
-further details.
+Copyright (c) 2011 Nickolas Means / ActiveProspect, Inc. See LICENSE.txt for further details.

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/deployflow.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{deployflow}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nickolas Means"]
@@ -25,9 +25,7 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "deployflow.gemspec",
-    "lib/capistrano/deployflow.rb",
-    "test/helper.rb",
-    "test/test_deployflow.rb"
+    "lib/capistrano/deployflow.rb"
   ]
   s.homepage = %q{http://github.com/nmeans/deployflow}
   s.licenses = ["MIT"]

metadata

@@ -2,7 +2,7 @@
 name: deployflow
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Nickolas Means
@@ -98,8 +98,6 @@ files:
 - VERSION
 - deployflow.gemspec
 - lib/capistrano/deployflow.rb
-- test/helper.rb
-- test/test_deployflow.rb
 has_rdoc: true
 homepage: http://github.com/nmeans/deployflow
 licenses: 
@@ -114,7 +112,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3863862650389113681
+      hash: 331035867074716980
       segments: 
       - 0
       version: "0"

data/test/helper.rb

@@ -1,18 +0,0 @@
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'test/unit'
-require 'shoulda'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'deployflow'
-
-class Test::Unit::TestCase
-end

data/test/test_deployflow.rb

@@ -1,7 +0,0 @@
-require 'helper'
-
-class TestDeployflow < Test::Unit::TestCase
-  should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
-  end
-end