capflow 0.7.0 → 0.8.2

data/Gemfile

@@ -1,12 +1,13 @@
 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'
-gem "ablerc", "~> 0.1.0"
-
+# Add dependencies to develop your gem here.
+# Include everything needed to run rake, tests, features, etc.
 group :development do
   gem "shoulda", "~> 3.0.0.beta2"
   gem 'active_support'
@@ -17,5 +18,3 @@ group :development do
   gem "jeweler", "~> 1.6.4"
   gem "rcov", ">= 0"
 end
-
-gemspec

data/VERSION

@@ -1 +1 @@
-2.0.0
+0.8.3

data/capflow.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "capflow"
-  s.version = "0.7.0"
+  s.version = "0.8.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Spencer Markowski"]
@@ -29,6 +29,7 @@ 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,22 +1,5 @@
 require 'capflow/configuration'
 require 'capflow/version'
-
-if defined?(Bundler)
-  #Bundler.setup
-  #Bundler.require(:default)
-end
-
 module Capflow
-
-  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?
-
+  require 'railtie' if defined?(Rails)
 end

data/lib/capistrano/capflow.rb

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

data/lib/capistrano/helpers/capflow_helper.rb

@@ -0,0 +1,57 @@
+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
+          BANNER
+        end
+
+    end
+  end
+end

data/lib/tasks/capflow.rake

@@ -29,43 +29,7 @@ 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: 3
+  hash: 59
   prerelease: 
   segments: 
   - 0
-  - 7
-  - 0
-  version: 0.7.0
+  - 8
+  - 2
+  version: 0.8.2
 platform: ruby
 authors: 
 - Spencer Markowski
@@ -18,6 +18,8 @@ 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: 
@@ -27,11 +29,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id001
-  name: capistrano
-  prerelease: false
   type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
+  name: stringex
+  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -41,11 +43,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id002
-  name: stringex
-  prerelease: false
   type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
+  name: versionomy
+  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -55,11 +57,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id003
-  name: versionomy
-  prerelease: false
   type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
+  name: rainbow
+  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -69,17 +71,17 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id004
-  name: rainbow
-  prerelease: false
   type: :runtime
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
+  name: shoulda
+  prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: -3339270128
+        hash: 206029515
         segments: 
         - 3
         - 0
@@ -87,11 +89,11 @@ dependencies:
         - beta
         - 2
         version: 3.0.0.beta2
-  version_requirements: *id005
-  name: shoulda
-  prerelease: false
   type: :development
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
+  name: active_support
+  prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -101,11 +103,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id006
-  name: active_support
-  prerelease: false
   type: :development
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
+  name: i18n
+  prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -115,11 +117,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id007
-  name: i18n
-  prerelease: false
   type: :development
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
+  name: minitest-rg
+  prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -129,11 +131,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id008
-  name: minitest-rg
-  prerelease: false
   type: :development
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
+  name: cucumber
+  prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -143,11 +145,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id009
-  name: cucumber
-  prerelease: false
   type: :development
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
+  name: bundler
+  prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -157,11 +159,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id010
-  name: bundler
-  prerelease: false
   type: :development
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
+  name: jeweler
+  prerelease: false
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -173,11 +175,11 @@ dependencies:
         - 6
         - 4
         version: 1.6.4
-  version_requirements: *id011
-  name: jeweler
-  prerelease: false
   type: :development
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
+  name: rcov
+  prerelease: false
   requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -187,10 +189,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id012
-  name: rcov
-  prerelease: false
   type: :development
+  version_requirements: *id012
 description: An unrestictive way to deploy using gitflow and capistrano
 email: spencer@theablefew.com
 executables: []
@@ -213,6 +213,7 @@ 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