heroku-bartender 0.3.0 → 0.3.1

data/README.markdown

@@ -13,9 +13,17 @@ Server options:
     -t, --target=TARGET              The target is the git remote in which you want to deploy (default heroku)
         --user=USER                  The user to login using HTTP Basic Auth
         --password=PASSWORD          The password to login using HTTP Basic Auth
-
+    -c, --commits=COUNT              The maximum number of commits to display (default 100)
 
 For now you must run `heroku-bartender` inside your repo dir
+
+## Specifying a Pre-Deploy Command
+
+You can specify a command to run before deployment.
+
+    git config --add remote.master.predeploy "rake test"
+
+
 # Features
 1. You can rollback your heroku app to a specific commit hash
 2. You can secure your heroku-bartender server using HTTP Basic Auth
@@ -25,7 +33,7 @@ For now you must run `heroku-bartender` inside your repo dir
 6. Shows colors/status for old deployed versions (only the versions that are deployed from the start)
 
 # TODO
-1. Keep update the repo
+1. Keep the repo up-to-date
 2. Handle branches/tags
 3. DB Rollback
 4. Styling view

data/bin/heroku-bartender

@@ -27,13 +27,13 @@ Choice.options do
   end
   
   option :user do
-    d = ''
+    d = nil
     long '--user=USER'
     desc "The user to login using HTTP Basic Auth"
     default d
   end
   option :password  do
-    d = ''
+    d = nil
     long '--password=PASSWORD'
     desc "The password to login using HTTP Basic Auth"
   end
@@ -48,6 +48,15 @@ Choice.options do
     desc "The target is the git remote in which you want to deploy (default #{d})"
     default d
   end
+
+  option :commits do
+    d = 100
+    short '-c'
+    long '--commits=COUNT'
+    desc "The maximum number of commits to show (default #{d})"
+    default d
+  end
+  
   option :help do
     long '--help'
     desc 'Show this message'
@@ -66,9 +75,5 @@ end
 
 options = Choice.choices
 
+Heroku::Bartender::Server.start(options)
 
-Heroku::Bartender::Server.start(options[:host],
-                                options[:port],
-                                options[:target],
-                                options[:user],
-                                options[:password])

data/lib/heroku/bartender.rb

@@ -1,3 +1,4 @@
+require "heroku/bartender/config"
 require "heroku/bartender/commit"
 require "heroku/bartender/log"
 require "heroku/bartender/command"

data/lib/heroku/bartender/command.rb

@@ -2,7 +2,7 @@ require 'grit'
 module Heroku
   module Bartender
     class Command
-
+    
       def self.current_version(heroku_remote)
         repo = Grit::Repo.new('.') 
         if repo.remote_list.include?(heroku_remote)
@@ -10,20 +10,33 @@ module Heroku
         end
         nil
       end
+      
       def self.sha_exist?(sha)
         if sha and not `git show #{sha}`.empty? 
           return true
         end
         false
       end
-      # move to an specific commit
-      def self.move_to release, heroku_remote
+      
+      def self.move_to release, predeploy, heroku_remote
+        @@last_error = nil
+        if ! predeploy.nil?
+          rc = system(predeploy)
+          if rc.nil? || ! rc
+            raise "Error executing '#{predeploy}': #{$?}"
+          end
+        end
         repo = Grit::Repo.new('.') 
-        if repo.remote_list.include?(heroku_remote) && sha_exist?(release)
-          `git push -f #{heroku_remote} #{release}:master`
-          return true
+        if ! repo.remote_list.include?(heroku_remote)
+          raise "No such remote `#{heroku_remote}`"
+        end
+        if ! sha_exist?(release)
+          raise "No such commit `#{release}"
+        end
+        rc = system("git push -f #{heroku_remote} #{release}:master")
+        if rc.nil? || ! rc 
+          raise "Error in `git push -f #{heroku_remote} #{release}:master`: #{$?}"
         end
-        false
       end
     end
   end

data/lib/heroku/bartender/config.rb

@@ -0,0 +1,48 @@
+# heavily inspired by https://github.com/defunkt/cijoe/blob/master/lib/cijoe/config.rb
+module Heroku
+  module Bartender
+    class Config
+
+      def self.method_missing(command, *args)
+        new(command, *args)
+      end
+
+      def initialize(command, project_path = nil, parent = nil)
+        @command  = command
+        @parent   = parent
+        @project_path = project_path || File.join(File.dirname(__FILE__), '../../')
+      end
+
+      def method_missing(command, *args)
+        Config.new(command, @project_path, self)
+      end
+
+      def to_s
+        git_command = "cd #{@project_path} && git config #{config_string}"
+        result = `#{git_command} 2>&1`.chomp
+        process_status = $?
+
+        if successful_command?(process_status) || config_command_with_empty_value?(result,process_status)
+          return result
+        else
+          raise "Error calling git config, is a recent version of git installed? Command: #{git_command.inspect}, Error: #{result.inspect}, Status: #{process_status.inspect}"
+        end
+      end
+
+      def config_string
+        @parent ? "#{@parent.config_string}.#{@command}" : @command
+      end
+
+      private
+
+      def successful_command?(process_status)
+        process_status.exitstatus.to_i == 0
+      end
+
+      def config_command_with_empty_value?(result, process_status)
+        process_status.exitstatus.to_i == 1 && result.empty?
+      end
+    end
+  end
+end
+

data/lib/heroku/bartender/log.rb

@@ -2,11 +2,11 @@ require "grit"
 module Heroku
   module Bartender
     class Log
-      def self.get_log
-        Grit::Repo.new('.').log
+      def self.get_log(options = {})
+        Grit::Repo.new('.').log('master', nil, options)
       end
-      def self.generate_commits
-        get_log.map do |item|
+      def self.generate_commits(options = {})
+        get_log(options).map do |item|
           Commit.new({ :sha   => item.sha         , :author  => item.author.name,
                        :email => item.author.email, :message => item.message,
                        :date  => item.date

data/lib/heroku/bartender/server.rb

@@ -3,47 +3,96 @@ require 'erb'
 module Heroku
   module Bartender
     class Server < Sinatra::Base
-      @@heroku_remote
-      @@user
-      @@pass
+
       @@deployed_versions = {}
       @@status = nil
+      @@options = {}
+
       dir = File.dirname(File.expand_path(__FILE__))
       set :views,  "#{dir}/views"
+      set :public, "#{dir}/public"
+
+      def self.commits
+        @@options[:commits]
+      end
+
+      def self.user
+        @@options[:user]
+      end
+
+      def self.password
+	      @@options[:password]
+      end
+
+      def self.target
+        @@options[:target] || 'heroku'
+      end
+      
+      def self.host
+        @@options[:host]
+      end
+      
+      def self.port
+        @@options[:port]
+      end
+      
+      def self.config
+        Config.send("remote.#{Server.target}")
+      end
+
+      def self.predeploy
+        config.predeploy.to_s
+      end
+  
+      def self.log_options
+        options = { }
+        options.merge({ :max_count => Server.commits }) if (Server.commits > 0)
+        options
+      end
+
       get "/" do
-        erb(:template, {}, :commits => Log.generate_commits,
-            :current_version => Command.current_version(@@heroku_remote),
+        erb(:template, {}, :commits => Log.generate_commits(Server.log_options),
+            :current_version => Command.current_version(Server.target),
             :deployed_versions => @@deployed_versions,
             :status => @@status
             )
       end
+      
       post "/" do
         if params[:sha]
-          @@status = Command.move_to params[:sha], @@heroku_remote
-          @@deployed_versions[params[:sha]] = [Time.now, @@status]
+          begin
+            Command.move_to params[:sha], predeploy, target
+            @@status = true
+            @@deployed_versions[params[:sha]] = [Time.now, @@status, nil]
+          rescue Exception => e
+            @@status = false
+            @@deployed_versions[params[:sha]] = [Time.now, @@status, e]
+          end
         end
-        erb(:template, {}, :commits => Log.generate_commits,
-            :current_version => Command.current_version(@@heroku_remote),
+        erb(:template, {}, :commits => Log.generate_commits(Server.log_options),
+            :current_version => Command.current_version(Server.target),
             :deployed_versions => @@deployed_versions,
             :status => @@status
             )
       end
-      def self.start(host, port, heroku_remote, user, pass)
-        @@heroku_remote = heroku_remote
-        authorize(user, pass)
-        Heroku::Bartender::Server.run!(:host => host, :port => port)
+            
+      def self.start(options = {})
+        @@options = options
+        authorize(user, password)
+        run!(:host => host, :port => port)
       end
 
-      def self.authorize(user, pass)
-        if user != '' && pass != ''
-          use Rack::Auth::Basic, "Restricted Area" do |username, password|
-            [username, password] == [user, pass]
+      def self.authorize(user, password)
+        if ! user.nil?
+          use Rack::Auth::Basic, "Restricted Area" do |u, p|
+            [u, p] == [user, password]
           end
         end
       end
 
       helpers do
         include Rack::Utils
+        
         def current_class(current_version_sha, sha)
           sha == current_version_sha ? 'current' : ''
         end
@@ -60,6 +109,7 @@ module Heroku
           end
           ''
         end
+        
         def state(status)
           if status == true
             return 'OK'
@@ -68,6 +118,15 @@ module Heroku
           end
           'UNKNOWN'
         end
+        
+        def target
+          Server.target
+        end
+        
+        def predeploy
+          Server.predeploy
+        end
+        
       end
     end
   end

data/lib/heroku/bartender/version.rb

@@ -1,5 +1,5 @@
 module Heroku
   module Bartender
-    VERSION = '0.3.0'
+    VERSION = '0.3.1'
   end
 end

data/lib/heroku/bartender/views/template.erb

@@ -22,11 +22,17 @@
   </head>
   <body>
     <div class='title'>
-      <h1> Heroku Bartender </h1>
+      <h1> Heroku Bartender</h1>
     </div>
-    <a href="#<%= current_version %>">
+    <div>
+    <ul>
+     <li><a href="#<%= current_version %>">
       Current version status: <%= state(status) %>
-    </a>
+     </a></li>
+     <li>Remote: <b><%= target %></b></li>
+     <li>Pre-deploy: <b><%= predeploy %></b></li>
+    </ul>
+    </div>
     <div class="site">
       <div id="home">
         <ul class="posts">
@@ -46,10 +52,15 @@
               <strong> Deployed date </strong>
               <%= deployed_versions[commit.sha][0] %>
             </p>
+            <div>
+              <small>
+                <%= deployed_versions[commit.sha][2] %>
+              </small>
+            </div>
             <% end %>
             <form method="POST">
               <input type="hidden" value="<%= commit.sha %>" name="sha"/>
-              <input type="submit" value="Build"/>
+              <input type="submit" value="Deploy"/>
             </form>
 
           </li>
@@ -64,7 +75,7 @@
           Unknown: No deployed version, or problems contacting heroku
         </div>
         <div class="red">
-          Fail: The deploy goes wrong
+          Fail: The deploy went wrong
         </div>
       </div>
     </div>

metadata

@@ -2,7 +2,7 @@
 name: heroku-bartender
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - Sebastian Arcila-Valenzuela
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-15 00:00:00 -05:00
+date: 2011-04-11 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -71,7 +71,9 @@ files:
 - LICENSE
 - lib/heroku/bartender/command.rb
 - lib/heroku/bartender/commit.rb
+- lib/heroku/bartender/config.rb
 - lib/heroku/bartender/log.rb
+- lib/heroku/bartender/public/favicon.ico
 - lib/heroku/bartender/server.rb
 - lib/heroku/bartender/version.rb
 - lib/heroku/bartender/views/template.erb