capflow 0.6.4 → 0.7.0

data/Gemfile

@@ -1,13 +1,12 @@
 source "http://rubygems.org"
-# Add dependencies required to use your gem here.
-# Example:
-#   gem "activesupport", ">= 2.3.5"
+
 gem 'capistrano'
 gem 'stringex'
+gem 'hashie'
 gem 'versionomy'
 gem 'rainbow'
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
+gem "ablerc", "~> 0.1.0"
+
 group :development do
   gem "shoulda", "~> 3.0.0.beta2"
   gem 'active_support'
@@ -18,3 +17,5 @@ group :development do
   gem "jeweler", "~> 1.6.4"
   gem "rcov", ">= 0"
 end
+
+gemspec

data/VERSION

@@ -1 +1 @@
-0.6.4
+2.0.0

data/capflow.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "capflow"
-  s.version = "0.6.4"
+  s.version = "0.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Spencer Markowski"]
@@ -29,7 +29,6 @@ Gem::Specification.new do |s|
     "features/support/env.rb",
     "lib/capflow.rb",
     "lib/capistrano/capflow.rb",
-    "lib/capistrano/helpers/capflow_helper.rb",
     "lib/railtie.rb",
     "lib/tasks/capflow.rake",
     "recipes/capflow_recipes.rb",

data/lib/capflow.rb

@@ -1,3 +1,22 @@
+require 'capflow/configuration'
+require 'capflow/version'
+
+if defined?(Bundler)
+  #Bundler.setup
+  #Bundler.require(:default)
+end
+
 module Capflow
-  require 'railtie' if defined?(Rails)
+
+  if defined?(Rails)
+    require 'railtie' 
+    Capflow::Version.base_dir = Rails.root
+  end
+
+  def self.root
+    File.expand_path '../..', __FILE__
+  end
+
+  Configuration.load! Configuration::PROJECT_CONFIG_FILE if Capflow::Configuration.project_settings?
+
 end

data/lib/capistrano/capflow.rb

@@ -1,11 +1,11 @@
 require 'capistrano'
-require 'capistrano/helpers/capflow_helper'
+require File.join(File.expand_path('../..', __FILE__), 'capflow')
 require 'versionomy'
 require 'stringex'
 require 'rainbow'
 
 module Capistrano
-  class Capflow
+  class CapflowApplicator 
     trap("SIGINT") { puts "Leaving Capflow!".color(:red); exit }
     # I gave up for now, since namespace can't call include
  #   include Capistrano::Helpers::CapflowHelper
@@ -51,24 +51,19 @@ module Capistrano
         end
 
         def available_tags
-          Capistrano::CLI.ui.say "Available Tags:"
-          Capistrano::CLI.ui.say "#{non_release_tags.join("\n")}"
+          Capistrano::CLI.ui.say "Available Tags:".color :green
+          Capistrano::CLI.ui.say "#{releases.sort.reverse.take(Capflow::Configuration.previous_releases.to_i).join("\n")}"
         end
 
         def available_releases
           Capistrano::CLI.ui.say "\nAvailable Releases:".color :green
-          Capistrano::CLI.ui.say "#{releases.sort.reverse.join("\n")}"
+          Capistrano::CLI.ui.say "#{releases.reverse.take(Capflow::Configuration.previous_releases.to_i).join("\n")}"
         end
 
         def banner
 
           <<-BANNER
 \nCapflow for Gitflow
-  ,-------------.
- (o) _ __ _____  )--.
-  `-------------'    )
-                    (     /
-                     `---'
           BANNER
         end
 
@@ -193,5 +188,5 @@ Please make sure you have pulled and pushed all code before deploying:
 end
 
 if Capistrano::Configuration.instance
-  Capistrano::Capflow.load_into(Capistrano::Configuration.instance)
+  Capistrano::CapflowApplicator.load_into(Capistrano::Configuration.instance)
 end

data/lib/tasks/capflow.rake

@@ -29,7 +29,43 @@ end
 
 namespace :capflow do
   desc "Show available releases"
-  task :releases do
+  task :releases do 
     puts `git tag`.split("\n").compact.collect{|version| Versionomy.parse(version)}.sort.reverse
+    exit
+  end
+
+  task :configuration do
+    puts "Gitflow"
+    Capflow::Configuration.ablerc.stub.generate :local
+    exit
+  end
+end
+
+# from https://github.com/technicalpickles/jeweler/blob/master/lib/jeweler/tasks.rb
+namespace :version do
+  desc "Writes out an explicit version. Respects the following environment variables, or defaults to 0: MAJOR, MINOR, PATCH. Also recognizes BUILD, which defaults to nil"
+  task :write do
+    version = Capflow::Version.write_version( :major => ENV['MAJOR'].to_i, :minor => ENV['MINOR'].to_i, :tiny => ENV['PATCH'].to_i, :build => (ENV['BUILD'] || nil ) )
+    $stdout.puts "Updated version: #{version.to_s}"
+  end
+
+  namespace :bump do
+    desc "Bump the major version by 1"
+    task :major => [:version_required, :version] do
+      #jeweler.bump_major_version
+      $stdout.puts "Updated version: #{jeweler.version}"
+    end
+
+    desc "Bump the a minor version by 1"
+    task :minor => [:version_required, :version] do
+      #jeweler.bump_minor_version
+      $stdout.puts "Updated version: #{jeweler.version}"
+    end
+
+    desc "Bump the patch version by 1"
+    task :patch => [:version_required, :version] do
+      #jeweler.bump_patch_version
+      $stdout.puts "Updated version: #{jeweler.version}"
+    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: capflow
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 3
   prerelease: 
   segments: 
   - 0
-  - 6
-  - 4
-  version: 0.6.4
+  - 7
+  - 0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Spencer Markowski
@@ -18,8 +18,6 @@ cert_chain: []
 date: 2013-03-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: capistrano
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -29,11 +27,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: stringex
+  name: capistrano
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -43,11 +41,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: versionomy
+  name: stringex
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -57,11 +55,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
   version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rainbow
+  name: versionomy
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -71,17 +69,17 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
   version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: shoulda
+  name: rainbow
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 2327717285
+        hash: -3339270128
         segments: 
         - 3
         - 0
@@ -89,11 +87,11 @@ dependencies:
         - beta
         - 2
         version: 3.0.0.beta2
-  type: :development
   version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: active_support
+  name: shoulda
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -103,11 +101,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
   version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: i18n
+  name: active_support
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -117,11 +115,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
   version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: minitest-rg
+  name: i18n
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -131,11 +129,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
   version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: cucumber
+  name: minitest-rg
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -145,11 +143,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
   version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: bundler
+  name: cucumber
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -159,11 +157,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
   version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: jeweler
+  name: bundler
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -175,11 +173,11 @@ dependencies:
         - 6
         - 4
         version: 1.6.4
-  type: :development
   version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: rcov
+  name: jeweler
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -189,8 +187,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
   version_requirements: *id012
+  name: rcov
+  prerelease: false
+  type: :development
 description: An unrestictive way to deploy using gitflow and capistrano
 email: spencer@theablefew.com
 executables: []
@@ -213,7 +213,6 @@ files:
 - features/support/env.rb
 - lib/capflow.rb
 - lib/capistrano/capflow.rb
-- lib/capistrano/helpers/capflow_helper.rb
 - lib/railtie.rb
 - lib/tasks/capflow.rake
 - recipes/capflow_recipes.rb

data/lib/capistrano/helpers/capflow_helper.rb

@@ -1,62 +0,0 @@
-module Capistrano
-  module Helpers
-    module CapflowHelper
-      
-        def who
-          identity = (`git config user.name` || `whoami`)
-          identity.chomp.to_url
-        end
-
-        def tags
-          `git tag`.split("\n").compact
-        end
-
-        def non_release_tags
-          tags - releases 
-        end
-
-        def current_branch
-          branches.select{|b| b =~ /^\*\s/}.first.gsub(/^\*\s/,"")
-        end
-
-        def branches
-         `git branch --no-color`.split("\n")
-        end
-
-        def version_tag_prefix
-          `git config gitflow.prefix.versiontag`.split("\n").first
-        end
-
-        def releases
-          tags.select{|t| t =~ /^#{version_tag_prefix}(\d+)/}
-        end
-
-        def latest_release
-          releases.sort{|x,y| x.split(version_tag_prefix).last <=> y.split(version_tag_prefix).last}.last
-        end
-
-        def available_tags
-          Capistrano::CLI.ui.say "Available Tags:"
-          Capistrano::CLI.ui.say "#{non_release_tags.join("\n")}"
-        end
-
-        def available_releases
-          Capistrano::CLI.ui.say "\nAvailable Releases:"
-          Capistrano::CLI.ui.say "#{releases.join("\n")}"
-        end
-
-        def banner
-
-          <<-BANNER
-\nCapflow for Gitflow
-  ,-------------.
- (o) _ __ _____  )--.
-  `-------------'    )
-                    (     /
-                     `---'
-          BANNER
-        end
-
-    end
-  end
-end