push2heroku 0.0.2 → 0.0.3

data/Gemfile

@@ -2,3 +2,5 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in push2heroku.gemspec
 gemspec
+
+gem 'rake'

data/README.md

@@ -1,33 +1,75 @@
 # Push2heroku
 
-Push to heroku.
+Makes it easy to push to heroku.
 
 ## Installation
 
-Add this line to your application's Gemfile:
+Add this to Gemfile:
 
     gem 'push2heroku'
 
-And then execute:
+## Usage
 
-    $ bundle
+After installing the gem copy [this file](https://raw.github.com/gist/3098161/578dad8cd3933834712a8afdf33520221dbdb986/push2heroku.yml) to `config/push2heroku.yml` .
 
-Or install it yourself as:
+Change the contents of `config/push2heroku.yml` as per your needs after
+reading rest of README.
 
-    $ gem install push2heroku
+## What problem it solves
 
-## Usage
+Here at BigBinary we create a separate branch for each feature we work
+on. Let's say that I am working on `authentication with facebook`.
+When I am done with the feature then I send pull request to my team
+members to review. However in order to review the work all the team
+members need to pull down the branch and fire up `rails server` and then
+review.
+
+We like to see things working. So we developed `push2heroku` to push a
+feature branch to heroku instantly with one command. Executing
+`push2heroku` prints a url and we put that url in the pull request so
+that team members can actually test the feature.
+
+## Here is how it works
+
+`push2heroku` reads the `push2heroku.yml` and executes those commands.
+It's that simple.
+
+Lets say that I am working in a branch called
+`76-facebook-authentication`. When I execute `push2heroku` then the
+application name under which it will be deployed to heroku will be
+`nimbleshop-76-facebook-neeraj`.
+
+`nimbleshop` is the name of the project.
+`76-facebook` is the first 10 letters of the branch name.
+`neeraj` is the first 5 letters of my github user name.
+
+So in this case the url of the application will be
+`http://nimbleshop-76-facebook-neeraj.herokuapp.com` .
+
+In the `push2heroku.yml` file the keys `production` and `staging`
+are branch names. And these branches are special branches. For these
+branches the url generated will be just the application name and the
+branch name. For example if I execute `rake push2heroku` from `staging`
+branch then the heroku url will be
+`http://nimbleshop-staging.herokuapp.com`.
+
+However if I delete `staging` key from `push2heroku.yml` then `staging`
+is no longer a special branch and the heroku url would be
+`http://nimbleshop-staging-neeraj.herokuapp.com` .
+
+## Resetting the database
 
-First copy `push2heroku.yml` from [here]().
+When the application is deployed for the very first time then you want
+the database to reset and some sort of setup to be run. However on
+subsequest deployment you do not need to run those setup tasks.
 
-`rake push2heroku`
+To incorporate that on first deployment `push2heroku` will execute
+commands mentioned under key `hard`. Here `hard` stands for hard push.
+Subsequent pushes will be `soft` push.
 
-push2heroku uses `cedar` stack.
+If you want to force `hard` push anytime then execute `rake push2heroku
+HARD=true`.
 
-## Contributing
+## License
 
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Added some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+`push2heroku` is released under MIT License.

data/lib/push2heroku.rb

@@ -7,6 +7,7 @@ module Push2heroku
   autoload :Base
   autoload :ConfigLoader
   autoload :Git
+  autoload :Util
 end
 
 require 'push2heroku/railtie'

data/lib/push2heroku/base.rb

@@ -1,24 +1,31 @@
 module Push2heroku
   class Base
 
-    attr_accessor :branch_name, :commands, :current_user, :subdomain, :settings
+    attr_accessor :branch_name, :commands, :current_user, :heroku_app_name, :settings, :named_branches
+    attr_reader :hard, :project_name
+
+    def initialize(hard)
+      @project_name = File.basename(Dir.getwd)
+      @hard = hard.blank? ? false : true
 
-    def initialize
       git = Git.new
       @branch_name = git.current_branch
       @current_user = git.current_user
-      @settings = ConfigLoader.new('push2heroku.yml').load(branch_name)
-      @commands = []
-      @subdomain = "#{url_prefix}-#{url_suffix}"
-    end
 
-    def self.process
-      new.push
+      @named_branches = ConfigLoader.new('push2heroku.yml').named_branches
+
+      @heroku_app_name = "#{url_prefix}-#{url_suffix}".downcase.chomp('-')[0..29] #heroku only allows upto 30 characters in name
+
+      ENV['BRANCH_NAME'] = branch_name
+      ENV['HEROKU_APP_NAME'] = heroku_app_name
+      @settings = ConfigLoader.new('push2heroku.yml').settings(branch_name)
+
+      @commands = []
     end
 
     def push
       build_commands
-      commands.each { |cmd| puts ">"*20 + cmd }
+      feedback_to_user
       commands.each do |cmd|
         begin
           sh cmd
@@ -31,31 +38,46 @@ module Push2heroku
     private
 
     def url_suffix
-      return branch_name if %w(staging production).include?(branch_name)
+      return branch_name if named_branches.include?(branch_name)
 
       [branch_name[0..10], current_user[0..5]].join('-').gsub(/[^0-9a-zA-Z]+/,'-').downcase
     end
 
     def url_prefix
-      settings.app_name.gsub(/[^0-9a-zA-Z]+/,'-').downcase
+      project_name.gsub(/[^0-9a-zA-Z]+/,'-').downcase
     end
 
     def build_commands
-      commands << "heroku create #{subdomain} --stack cedar --remote h#{branch_name}"
-      commands << "git push h#{branch_name} #{branch_name}:master -f "
-
+      commands << settings.pre_config_commands
       build_config_commands
-
-      commands << "heroku run rake db:migrate --app #{subdomain} --trace"
-      commands << "heroku run rake setup --app #{subdomain} --trace"
-      commands << "heroku open --app #{subdomain}"
+      commands << ( Util.hard_push?(self) ?  settings.post_config_commands.hard : settings.post_config_commands.soft )
+      commands << "bundle exec heroku open --app #{heroku_app_name}"
+      commands.flatten!
     end
 
     def build_config_commands
+      return unless settings.config
+      cmd = []
       settings.config.each do |key, value|
-        commands << "heroku config:add #{key.upcase}=#{value} --app #{subdomain}"
+        cmd << "#{key.upcase}=#{value}"
       end
+     commands << "bundle exec heroku config:add #{cmd.join(' ')} --app #{heroku_app_name}"
     end
 
+    def feedback_to_user
+      puts '='*50
+      puts 'The application will be deployed at:'
+      puts "http://#{heroku_app_name}.herokuapp.com"
+      puts '='*50
+      puts ''
+      puts '='*50
+      puts 'Following commands will be executed:'
+      commands.each do |cmd|
+        puts ''
+        puts cmd
+      end
+      puts '='*50
+      puts ''
+    end
   end
 end

data/lib/push2heroku/config_loader.rb

@@ -1,21 +1,37 @@
 module Push2heroku
   class ConfigLoader
 
-    attr_reader :filename
+    attr_reader :filename, :hash
 
     def initialize(filename)
       @filename = filename
+      @hash = load_config
     end
 
-    def load(key)
-      file            = Rails.root.join('config', filename)
-      hash            = YAML.load(ERB.new(File.read(file)).result)
-
+    def settings(branch_name)
       common_hash = hash['common'] || {}
-      env_hash = hash[key.to_s] || {}
-
+      env_hash = hash[branch_name.to_s] || {}
       final_hash = common_hash.deep_merge(env_hash)
       Hashr.new(final_hash)
     end
+
+    def named_branches
+      hash.keys - ['common']
+    end
+
+    private
+
+    def load_config
+      file            = Rails.root.join('config', filename)
+
+      unless File.exists? file
+        puts "you do not have config/push2heroku.yml file. Please execute "
+        puts "rails generate push2heroku:install"
+        abort
+      end
+      YAML.load(ERB.new(File.read(file)).result)
+    end
+
+
   end
 end

data/lib/push2heroku/git.rb

@@ -5,12 +5,12 @@ module Push2heroku
       if result.empty?
         raise "It seems your app is not a git repo"
       else
-        result.select { |b| b =~ /^\*/ }.first.split(" ").last.strip.downcase
+        result.select { |b| b =~ /^\*/ }.first.split(" ").last.strip
       end
     end
 
     def current_user
-      `git config user.name`.chop!.downcase
+      `git config user.name`.chop!
     end
   end
 end

data/lib/push2heroku/railtie.rb

@@ -4,7 +4,8 @@ module Push2heroku
     rake_tasks do
       desc "pushes to heroku"
       task :push2heroku => :environment do
-        Base.process
+        hard = ENV['HARD']
+        Base.new(hard).push
       end
     end
 

data/lib/push2heroku/util.rb

@@ -0,0 +1,13 @@
+class Util
+
+  def self.hard_push?(base)
+    remote_branch_name = "h#{base.branch_name}"
+    base.hard || !remote_branch_exists?(remote_branch_name)
+  end
+
+  def self.remote_branch_exists?(remote_branch_name)
+   out = `cd #{Rails.root.expand_path} && git branch -r`
+   out.include?(remote_branch_name)
+  end
+
+end

data/lib/push2heroku/version.rb

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

data/push2heroku.gemspec

@@ -16,5 +16,5 @@ Gem::Specification.new do |gem|
   gem.version       = Push2heroku::VERSION
 
   gem.add_dependency("hashr", "= 0.0.19")
-  gem.add_dependency("heroku")
+  gem.add_dependency("heroku", "= 2.25.0")
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: push2heroku
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,30 +9,40 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-25 00:00:00.000000000Z
+date: 2012-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashr
-  requirement: &70184765576220 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.0.19
   type: :runtime
   prerelease: false
-  version_requirements: *70184765576220
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.19
 - !ruby/object:Gem::Dependency
   name: heroku
-  requirement: &70184765575800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.25.0
   type: :runtime
   prerelease: false
-  version_requirements: *70184765575800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.25.0
 description: push2heroku
 email:
 - neerajdotname@gmail.com
@@ -50,6 +60,7 @@ files:
 - lib/push2heroku/config_loader.rb
 - lib/push2heroku/git.rb
 - lib/push2heroku/railtie.rb
+- lib/push2heroku/util.rb
 - lib/push2heroku/version.rb
 - push2heroku.gemspec
 homepage: ''
@@ -64,15 +75,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2308710282152006324
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2308710282152006324
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: push2heroku