heroploy 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2596af30153567d6c7fff7dd776b944029034b6
-  data.tar.gz: a1ff270a3b794fb801bc226331c5277059a9b918
+  metadata.gz: 356baf2c9b896ba5dddc86702c4b549e7af81824
+  data.tar.gz: 79fb1cea8d3206b14e22c37f087bf967702bcd99
 SHA512:
-  metadata.gz: 35de3c056e9eff9e0f0cb2a463f20bdce9265ba9247086939e8a0fc1a4f9533d6244aa67cd55c04b342c538f5b65e92bafe1343dca99dfbeac12d1aff9613804
-  data.tar.gz: b369f61be1d4bd0f4caa0d5524125494be8204a2a9b504baf19db95c7a717efe080bc2f47fd3bdf5a3947198109827e3823f1a3c8a534bf07fde0c685b3de390
+  metadata.gz: c0963dd5196fffa11e2307f5481dbd02bd0d75b794bba7427a487fa2657a5154c524fa1d7639c080862d29da35bc199dca2c7007fdcde3df1cf26444c7458960
+  data.tar.gz: 14460f37d4ebe158c98d8a3c4dce756f83064a1b9d96cd8dc10658a1a0cf5d763ffe4fc846fdbc5771542066dfe9e88aa5ba8a6d76aa23c175b3271fe0a69c3e

data/.coveralls.yml

@@ -0,0 +1 @@
+service_name: travis-ci

data/README.md

@@ -3,6 +3,7 @@
 [![Build Status](https://travis-ci.org/jbrunton/heroploy.png?branch=master)](https://travis-ci.org/jbrunton/heroploy)
 [![Dependency Status](https://gemnasium.com/jbrunton/heroploy.png)](https://gemnasium.com/jbrunton/heroploy)
 [![Code Climate](https://codeclimate.com/github/jbrunton/heroploy.png)](https://codeclimate.com/github/jbrunton/heroploy)
+[![Coverage Status](https://coveralls.io/repos/jbrunton/heroploy/badge.png?branch=master)](https://coveralls.io/r/jbrunton/heroploy?branch=master)
 
 A few helpful rake tasks to manage deploying Rails apps to development, staging and production Heroku servers.
 
@@ -24,21 +25,25 @@ Or install it yourself as:
 
 Add a ```heroploy.yml``` file to your application's config directory which describes the Heroku apps you will deploy to, and the checks you would like when deploying to each.
 
-For example:
+If you're running Rails, you can use this generator to add an example config file:
+
+    rails generate heroploy:install
+    
+Here's an example ```heroploy.yml``` file:
 
 ```yaml
 environments:
   development:
-    heroku: my-development-app
+    app: my-development-app
 
   staging:
-    heroku: my-staging-app
+    app: my-staging-app
     checks:
       pushed: true
       branch: master
 
   production:
-    heroku: my-production-app
+    app: my-production-app
     tag: 'RELEASE_%Y%m%dT%H%M%S%z'
     checks:
       pushed: true

data/heroploy.gemspec

@@ -20,6 +20,9 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "rails"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "factory_girl"
+  spec.add_development_dependency "generator_spec"
+  spec.add_development_dependency "coveralls"
 end

data/lib/generators/heroploy/install/USAGE

@@ -0,0 +1,8 @@
+Description:
+    Installs a heroploy config file
+
+Example:
+    rails generate heroploy:install
+
+    This will create:
+        config/heroploy.yml

data/lib/generators/heroploy/install/install_generator.rb

@@ -0,0 +1,9 @@
+module Heroploy
+  class InstallGenerator < Rails::Generators::Base
+    source_root File.expand_path('../templates', __FILE__)
+
+    def copy_config
+      copy_file "config/heroploy.yml"
+    end  
+  end
+end

data/lib/generators/heroploy/install/templates/config/heroploy.yml

@@ -0,0 +1,35 @@
+environments:
+
+# Add a development environment, to which you can deploy anything:
+#
+# development:
+#   app: my-development-app
+
+# You may also want a staging environment, to which you can only deploy pushed
+# commits from master:
+#
+# staging:
+#   app: my-staging-app
+#   checks:
+#     pushed: true
+#     branch: master
+
+# And here's a possible production app, which requires changes to have first
+# been staged:
+  
+# production:
+#   app: my-production-app
+#   tag: 'RELEASE_%Y%m%dT%H%M%S%z'
+#   checks:
+#     pushed: true
+#     branch: master
+#     staged: true
+
+# Finally, if you have a single Heroku app, this should work for now:
+
+  heroku:
+    app: my-heroku-app-name
+    tag: 'RELEASE_%Y%m%dT%H%M%S%z'
+    checks:
+      pushed: true
+      branch: master

data/lib/heroploy/config/env_config.rb

@@ -3,7 +3,7 @@ require 'heroploy/config/checks_config'
 class EnvConfig
   attr_accessor :name
   attr_accessor :remote
-  attr_accessor :heroku
+  attr_accessor :app
   attr_accessor :tag
   attr_accessor :checks
   
@@ -12,7 +12,7 @@ class EnvConfig
     
     config.name = name
     config.remote = attrs['remote'] || name
-    config.heroku = attrs['heroku']
+    config.app = attrs['app']
     config.tag = attrs['tag']
     config.checks = ChecksConfig.parse(attrs['checks'])
 

data/lib/{railtie.rb → heroploy/engine.rb}

@@ -1,7 +1,7 @@
-require 'rails'
-
 module Heroploy
-  class Railtie < Rails::Railtie
+  class Engine < ::Rails::Engine
+    isolate_namespace Heroploy
+
     rake_tasks do
       load 'heroploy/tasks/tasks.rake'
     end

data/lib/heroploy/tasks/check_task_lib.rb

@@ -14,43 +14,70 @@ module Heroploy
     include Commands::Heroku
     include Commands::Checks
     
+    attr_accessor :deploy_config
+    attr_accessor :env_config
+    attr_accessor :defined_tasks
+    
     def initialize(deploy_config, env_config)
+      @deploy_config = deploy_config
+      @env_config = env_config
+      @defined_tasks = []
+      define      
+    end
+    
+    def define
+      define_remote_check
+      define_pushed_check
+      define_branch_check
+      define_staged_check
+      define_all_check
+    end
+    
+    def define_remote_check
       desc "check remote exists for #{env_config.name}"
       task :remote do
         remote = env_config.remote
         check_remote(remote)
       end
       
-      all_tasks = [:remote]
-
+      @defined_tasks << :remote
+    end
+    
+    def define_pushed_check
       if env_config.checks.pushed then
         desc "check changes have been pushed to origin"
         task :pushed do
           check_pushed(current_branch)
         end
-        all_tasks << :pushed
+        @defined_tasks << :pushed
       end
-
+    end
+    
+    def define_branch_check
       if env_config.checks.branch then
         desc "check we can deploy to #{env_config.name} from the current branch"
         task :branch do
           valid_branch = env_config.checks.branch
           check_branch(current_branch, valid_branch, env_config.name)
         end
-        all_tasks << :branch
+        @defined_tasks << :branch
       end
-
+    end
+    
+    def define_staged_check
       if env_config.checks.staged then
         desc "check the changes have already been staged"
         task :staged do
           staging_env_config = deploy_config[env_config.checks.staged]
           check_staged(staging_env_config.remote, current_branch, staging_env_config.name)
         end
-        all_tasks << :staged
+        @defined_tasks << :staged
       end
-
+    end
+    
+    def define_all_check
       desc "do all the checks for #{env_config.name}"
-      task :all => all_tasks
+      task :all => @defined_tasks
     end
   end
 end

data/lib/heroploy/tasks/deploy_task_lib.rb

@@ -11,12 +11,26 @@ module Heroploy
   class DeployTaskLib < ::Rake::TaskLib
     include ::Rake::DSL if defined?(::Rake::DSL)
     
+    attr_accessor :deploy_config
+    
     def initialize(deploy_config)
+      @deploy_config = deploy_config
+      define
+    end
+
+    def define
+      define_fetch_task
+      define_env_tasks
+    end
+    
+    def define_fetch_task
       desc 'do a git fetch'
       task :fetch do
         git_fetch
       end
-
+    end
+    
+    def define_env_tasks
       deploy_config.environments.each do |env_config|
         EnvTaskLib.new(deploy_config, env_config)
       end

data/lib/heroploy/tasks/env_task_lib.rb

@@ -15,34 +15,53 @@ module Heroploy
     include Commands::Heroku
     include Commands::Checks
     
+    attr_accessor :deploy_config
+    attr_accessor :env_config
+    
     def initialize(deploy_config, env_config)
-      namespace env_config.name do
-        namespace :check do
-          CheckTaskLib.new(deploy_config, env_config)
-        end
-
-        desc "push the current branch to master on #{env_config.name}"
-        task :push do
-          git_push_to_master(env_config.remote, current_branch)
-        end
+      @deploy_config = deploy_config
+      @env_config = env_config
+      define
+    end
 
-        desc "run database migrations on #{env_config.name}"
-        task :migrate do
-          heroku_migrate(env_config.heroku)
-        end
+    def define
+      namespace env_config.name do
+        define_check_tasks
+        define_git_tasks
+        define_heroku_tasks
+      end
+    end
+    
+    def define_check_tasks
+      namespace :check do
+        CheckTaskLib.new(deploy_config, env_config)
+      end
+    end
+    
+    def define_git_tasks
+      desc "push the current branch to master on #{env_config.name}"
+      task :push do
+        git_push_to_master(env_config.remote, current_branch)
+      end
 
-        desc "tag the deployment to #{env_config.name}"
-        task :tag do
-          if env_config.tag then
-            tag = DateTime.now.strftime(env_config.tag)
-            git_tag(tag, "Deployed #{current_branch} to #{env_config.name}")
-            git_push_tag(tag)
-          end
+      desc "tag the deployment to #{env_config.name}"
+      task :tag do
+        if env_config.tag then
+          tag = DateTime.now.strftime(env_config.tag)
+          git_tag(tag, "Deployed #{current_branch} to #{env_config.name}")
+          git_push_tag(tag)
         end
-
-        desc "deploy to #{env_config.name}"
-        task :deploy => ['check:all', :push, :migrate, :tag]
       end
     end
+    
+    def define_heroku_tasks
+      desc "run database migrations on #{env_config.name}"
+      task :migrate do
+        heroku_migrate(env_config.app)
+      end
+
+      desc "deploy to #{env_config.name}"
+      task :deploy => ['check:all', :push, :migrate, :tag]
+    end
   end
 end

data/lib/heroploy/tasks/tasks.rake

@@ -1,6 +1,10 @@
 require 'heroploy/tasks/deploy_task_lib'
 
 namespace :heroploy do
-  deploy_config = DeployConfig.load  
-  Heroploy::DeployTaskLib.new(deploy_config)
+  begin
+    deploy_config = DeployConfig.load  
+    Heroploy::DeployTaskLib.new(deploy_config)
+  rescue Errno::ENOENT
+    puts "Warning: no config file present for Heroploy.  Run 'rails generate heroploy:install' or add a heroploy.yml file to your project."
+  end
 end

data/lib/heroploy/version.rb

@@ -1,3 +1,3 @@
 module Heroploy
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/heroploy.rb

@@ -1,5 +1,7 @@
+require "rails"
+
 require "heroploy/version"
-require File.join(File.dirname(__FILE__), 'railtie.rb') if defined?(Rails) && Rails::VERSION::MAJOR >= 3
+require "heroploy/engine" if defined?(Rails) && Rails::VERSION::MAJOR >= 3
 
 module Heroploy
   def self.root

data/spec/lib/generators/heroploy/install_generator_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+require File.expand_path('../../../../../lib/generators/heroploy/install/install_generator', __FILE__)
+
+describe Heroploy::InstallGenerator do
+  include_context "generator"
+
+  it "copies the heroploy.yml template" do
+    destination_root.should have_structure {
+      directory 'config' do
+        file 'heroploy.yml'
+      end
+    }
+  end
+end

data/spec/spec_helper.rb

@@ -1,13 +1,25 @@
+require 'coveralls'
+Coveralls.wear! do
+  add_filter '/spec/'
+end
+    
 require 'factory_girl'
+require 'rails/generators'
+
+require "generator_spec/test_case"
+require "generator_spec/matcher"
 
 require 'heroploy'
 require 'heroploy/tasks/deploy_task_lib'
 
 require 'support/shell_support'
 require 'support/shared_contexts/rake'
+require 'support/shared_contexts/generator'
 
 FactoryGirl.find_definitions
 
+TMP_ROOT = Pathname.new(File.expand_path('../tmp', __FILE__))
+
 RSpec.configure do |config|
   config.color_enabled = true
   

data/spec/support/shared_contexts/generator.rb

@@ -0,0 +1,17 @@
+shared_context "generator" do
+  include GeneratorSpec::TestCase
+  destination TMP_ROOT
+
+  before(:all) do
+    prepare_destination
+    
+    APP_CONFIG_PATH = TMP_ROOT.join('config')
+    FileUtils.mkpath APP_CONFIG_PATH
+
+    run_generator
+  end
+  
+  after(:all) do
+    FileUtils.rm_rf TMP_ROOT
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: heroploy
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - John Brunton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-28 00:00:00.000000000 Z
+date: 2014-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +80,34 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: generator_spec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Helpful rake tasks to manage deploying to development, staging and production
   Heroku servers
 email:
@@ -74,6 +116,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .coveralls.yml
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -81,6 +124,9 @@ files:
 - README.md
 - Rakefile
 - heroploy.gemspec
+- lib/generators/heroploy/install/USAGE
+- lib/generators/heroploy/install/install_generator.rb
+- lib/generators/heroploy/install/templates/config/heroploy.yml
 - lib/heroploy.rb
 - lib/heroploy/commands/checks.rb
 - lib/heroploy/commands/git.rb
@@ -89,13 +135,14 @@ files:
 - lib/heroploy/config/checks_config.rb
 - lib/heroploy/config/deploy_config.rb
 - lib/heroploy/config/env_config.rb
+- lib/heroploy/engine.rb
 - lib/heroploy/tasks/check_task_lib.rb
 - lib/heroploy/tasks/deploy_task_lib.rb
 - lib/heroploy/tasks/env_task_lib.rb
 - lib/heroploy/tasks/tasks.rake
 - lib/heroploy/version.rb
-- lib/railtie.rb
 - spec/factories.rb
+- spec/lib/generators/heroploy/install_generator_spec.rb
 - spec/lib/heroploy/commands/checks_spec.rb
 - spec/lib/heroploy/commands/git_spec.rb
 - spec/lib/heroploy/commands/heroku_spec.rb
@@ -107,6 +154,7 @@ files:
 - spec/lib/heroploy/tasks/check_staged_spec.rb
 - spec/spec_helper.rb
 - spec/support/helpers/deploy_config_helper.rb
+- spec/support/shared_contexts/generator.rb
 - spec/support/shared_contexts/rake.rb
 - spec/support/shell_support.rb
 homepage: ''
@@ -135,6 +183,7 @@ specification_version: 4
 summary: Helpful rake tasks for deploying to Heroku
 test_files:
 - spec/factories.rb
+- spec/lib/generators/heroploy/install_generator_spec.rb
 - spec/lib/heroploy/commands/checks_spec.rb
 - spec/lib/heroploy/commands/git_spec.rb
 - spec/lib/heroploy/commands/heroku_spec.rb
@@ -146,5 +195,6 @@ test_files:
 - spec/lib/heroploy/tasks/check_staged_spec.rb
 - spec/spec_helper.rb
 - spec/support/helpers/deploy_config_helper.rb
+- spec/support/shared_contexts/generator.rb
 - spec/support/shared_contexts/rake.rb
 - spec/support/shell_support.rb