heroku-bartender 0.2.0 → 0.3.0

data/README.markdown

@@ -20,6 +20,9 @@ For now you must run `heroku-bartender` inside your repo dir
 1. You can rollback your heroku app to a specific commit hash
 2. You can secure your heroku-bartender server using HTTP Basic Auth
 3. You can use a custom heroku remote target to deploy your app
+4. Shows red/yellow/green status for deploys (red: fail, green: ok, yellow: unknow problem)
+5. Shows dates for deployed versions
+6. Shows colors/status for old deployed versions (only the versions that are deployed from the start)
 
 # TODO
 1. Keep update the repo

data/lib/heroku/bartender/command.rb

@@ -1,10 +1,29 @@
+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)
+          return `git ls-remote #{heroku_remote}`.split("\t").first
+        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
-      # Pending ada more testing stuff
       def self.move_to release, heroku_remote
-        `git push -f #{heroku_remote} #{release}:master`
+        repo = Grit::Repo.new('.') 
+        if repo.remote_list.include?(heroku_remote) && sha_exist?(release)
+          `git push -f #{heroku_remote} #{release}:master`
+          return true
+        end
+        false
       end
     end
   end

data/lib/heroku/bartender/log.rb

@@ -1,9 +1,9 @@
-require "git"
+require "grit"
 module Heroku
   module Bartender
     class Log
-      def self.get_log(old_commits = 500)
-        Git.open('.').log(old_commits)
+      def self.get_log
+        Grit::Repo.new('.').log
       end
       def self.generate_commits
         get_log.map do |item|

data/lib/heroku/bartender/server.rb

@@ -6,16 +6,27 @@ module Heroku
       @@heroku_remote
       @@user
       @@pass
+      @@deployed_versions = {}
+      @@status = nil
       dir = File.dirname(File.expand_path(__FILE__))
       set :views,  "#{dir}/views"
       get "/" do
-        erb(:template, {}, :commits => Log.generate_commits)
+        erb(:template, {}, :commits => Log.generate_commits,
+            :current_version => Command.current_version(@@heroku_remote),
+            :deployed_versions => @@deployed_versions,
+            :status => @@status
+            )
       end
       post "/" do
         if params[:sha]
-          Command.move_to params[:sha], @@heroku_remote
+          @@status = Command.move_to params[:sha], @@heroku_remote
+          @@deployed_versions[params[:sha]] = [Time.now, @@status]
         end
-        erb(:template, {}, :commits => Log.generate_commits)
+        erb(:template, {}, :commits => Log.generate_commits,
+            :current_version => Command.current_version(@@heroku_remote),
+            :deployed_versions => @@deployed_versions,
+            :status => @@status
+            )
       end
       def self.start(host, port, heroku_remote, user, pass)
         @@heroku_remote = heroku_remote
@@ -29,7 +40,35 @@ module Heroku
             [username, password] == [user, pass]
           end
         end
-      end        
+      end
+
+      helpers do
+        include Rack::Utils
+        def current_class(current_version_sha, sha)
+          sha == current_version_sha ? 'current' : ''
+        end
+
+        def color_status(version_sha)
+          if @@deployed_versions[version_sha]
+            status = @@deployed_versions[version_sha][1]
+            if status == true
+              return 'green'
+            elsif status == false
+              return 'red'
+            end
+            return 'yellow'
+          end
+          ''
+        end
+        def state(status)
+          if status == true
+            return 'OK'
+          elsif status == false
+            return 'FAIL'
+          end
+          'UNKNOWN'
+        end
+      end
     end
   end
 end

data/lib/heroku/bartender/version.rb

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

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

@@ -2,24 +2,51 @@
 <html>
   <head>
     <title>Heroku Bartender</title>
+    <style type="text/css">
+      #home{
+      width: 80%;
+      float:left;
+      }
+      #colors{
+      margin-left: 81%;
+      position: fixed;
+      width: 20%;
+      }
+      .current{
+      color: blue;
+      }
+      .green  { background-color: lime;  }
+      .yellow { background-color: yellow; }
+      .red    { background-color: red;    }
+    </style>
   </head>
   <body>
     <div class='title'>
       <h1> Heroku Bartender </h1>
     </div>
+    <a href="#<%= current_version %>">
+      Current version status: <%= state(status) %>
+    </a>
     <div class="site">
       <div id="home">
         <ul class="posts">
           <% commits.each do |commit| %>
-          <li>
+          <li class="<%= current_class(current_version, commit.sha) %> <%= color_status(commit.sha) %>">
+            <a name="<%= commit.sha %>"> <%= commit.sha %> </a>
             <h3> <%= commit.author %> | <%= commit.email %></h3>
             <p>
-              <%= commit.sha %> 
+              <%= commit.message %>
             </p>
             <p>
-              <%= commit.message %>
+              <strong> Committed date </strong>
               <%= commit.date %>
             </p>
+            <% if deployed_versions[commit.sha] %>
+            <p>
+              <strong> Deployed date </strong>
+              <%= deployed_versions[commit.sha][0] %>
+            </p>
+            <% end %>
             <form method="POST">
               <input type="hidden" value="<%= commit.sha %>" name="sha"/>
               <input type="submit" value="Build"/>
@@ -29,6 +56,17 @@
           <% end %>
         </ul>
       </div>
+      <div id='colors'>
+        <div class="green">
+          Ok: The deploy runs properly
+        </div>
+        <div class="yellow">
+          Unknown: No deployed version, or problems contacting heroku
+        </div>
+        <div class="red">
+          Fail: The deploy goes wrong
+        </div>
+      </div>
     </div>
   </body>
 </html>

metadata

@@ -2,7 +2,7 @@
 name: heroku-bartender
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Sebastian Arcila-Valenzuela
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-11 00:00:00 -05:00
+date: 2011-03-15 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,14 +25,14 @@ dependencies:
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: git
+  name: grit
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.5
+        version: 2.4.1
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency