heidi 0.2.1 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.3.0

data/bin/heidi

@@ -7,6 +7,10 @@ cmd   = ARGV.shift
 for_a = ARGV.shift
 
 ENV['PATH'] = "/bin:/usr/bin:/usr/local/bin"
+if ENV['HEIDI_PATH']
+  ENV['PATH'] += ":#{ENV['HEIDI_PATH']}"
+  ENV['HEIDI_PATH'] = nil
+end
 
 shell = SimpleShell.new
 
@@ -19,10 +23,9 @@ end
 
 case cmd
 when "new"
-  puts "creating #{for_a}"
+  puts "creating #{for_a}/"
   puts "creating #{for_a}/projects"
   shell.mkdir %W(-p #{for_a}/projects)
-  puts "creating #{for_a}/bin"
   shell.mkdir %W(-p #{for_a}/bin)
   puts "creating #{for_a}/Gemfile"
   File.open("#{for_a}/Gemfile", File::CREAT|File::WRONLY) do |f|
@@ -30,14 +33,27 @@ when "new"
     f.puts 'gem "heidi"'
   end
 
-  puts "running bundle install"
-  shell.in(for_a) do |sh|
-    sh.bundle "install --binstubs --deployment"
-  end
+  puts "\nIf you like you can run: bundle install --binstubs"
+  puts "this will tie heidi and heidi_web to this location"
+  puts "\nFor even more tying down, run: bundle install --deployment"
+  puts "after running bundle install --binstubs"
+
 
 when "project"
+  repo = ARGV.shift
+
+  if repo.nil?
+    $stderr.puts "You must specify a repository"
+    exit 1
+  end
+
   check_heidi_root
 
+  if File.exists? "projects/#{for_a}"
+    $stderr.puts "projects/#{for_a} is in the way. Please remove it"
+    exit 1
+  end
+
   # create a logs dir
   puts "creating projects/#{for_a}"
   puts "creating projects/#{for_a}/logs"
@@ -51,7 +67,7 @@ when "project"
   # make a clone
   shell.in("projects/#{for_a}") do |sh|
     puts "filling #{for_a} cache"
-    repo = ARGV.shift
+
     puts "git clone #{repo}"
     sh.git %W(clone #{repo} cached)
 
@@ -60,7 +76,7 @@ when "project"
       cached.git %W(config heidi.name #{for_a})
     end
   end
-  puts "Creating default test hook: projects/#{for_a}/hooks/test/01_rspec"
+  puts "Creating default test hook: projects/#{for_a}/hooks/tests/01_rspec"
   File.open("projects/#{for_a}/hooks/tests/01_rspec", File::CREAT|File::WRONLY) do |f|
     f.puts %q(#!/bin/sh
 
@@ -68,7 +84,7 @@ when "project"
 bundle exec rake spec
 )
   end
-  shell.chmod %W(+x projects/#{for_a}/hooks/test/01_rspec)
+  shell.chmod %W(+x projects/#{for_a}/hooks/tests/01_rspec)
   puts "\n"
   puts "Now edit or add some hooks and run: heidi integrate #{for_a}"
 

data/heidi.gemspec

@@ -5,14 +5,14 @@
 
 Gem::Specification.new do |s|
   s.name = "heidi"
-  s.version = "0.2.1"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Hartog C. de Mik"]
-  s.date = "2012-02-09"
+  s.date = "2012-02-14"
   s.description = "CI-Joe alike CI system called Heidi."
   s.email = "hartog@organisedminds.com"
-  s.executables = ["heidi", "heidi_console", "heidi_cron", "heidi_web"]
+  s.executables = ["heidi", "heidi_web"]
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -27,8 +27,6 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "bin/heidi",
-    "bin/heidi_console",
-    "bin/heidi_cron",
     "bin/heidi_web",
     "heidi.gemspec",
     "lib/heidi.rb",
@@ -46,6 +44,8 @@ Gem::Specification.new do |s|
     "lib/heidi/web/public/images/OrganisedMinds.png",
     "lib/heidi/web/public/images/heidi.jpeg",
     "lib/heidi/web/views/build.erb",
+    "lib/heidi/web/views/commit.erb",
+    "lib/heidi/web/views/config.erb",
     "lib/heidi/web/views/home.erb",
     "lib/heidi/web/views/layout.erb",
     "lib/heidi/web/views/project.erb",
@@ -63,7 +63,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/coffeeaddict/heid"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "1.8.16"
   s.summary = "A naive CI system"
 
   if s.respond_to? :specification_version then

data/lib/heidi/git.rb

@@ -37,6 +37,12 @@ class Heidi
       res.out.split("\n").collect{ |b| b.gsub(/^[\s*]+/, '') }
     end
 
+    def remote_branches
+      res = @shell.git(%W(branch --no-color -r))
+      branches = res.out.split("\n").collect{ |b| b.gsub(/^[\s*]+/, '') }
+      branches.select { |b| b !~ /HEAD/ }
+    end
+
     # git checkout $name
     def switch(name)
       return nil unless branches.include?(name)
@@ -118,6 +124,14 @@ class Heidi
       @shell.git %W(log -n#{amount} --color --graph --pretty=oneline --abbrev-commit)
     end
 
+    def stat(commit)
+      @shell.git(%W(log -n1 --color --stat #{commit})).out
+    end
+
+    def diff(commit)
+      @shell.git(%W(diff --color #{commit}^ #{commit})).out
+    end
+
     # git config $key $value
     def []=(key, value)
       @shell.system("git", "config", "heidi.#{key}", value)

data/lib/heidi/project.rb

@@ -46,6 +46,10 @@ class Heidi
       @name ||= @git[:name]
     end
 
+    def basename
+      File.basename(@root)
+    end
+
     def commit
       @git.commit[0..8]
     end
@@ -90,6 +94,14 @@ class Heidi
       name = @git["build.branch"]
       name == "" ? nil : name
     end
+    def integration_branch=(name)
+      name = name.split('/').last if name =~ /\//
+      @git["build.branch"] = name
+    end
+
+    def integration_branches
+      @git.remote_branches
+    end
 
     def integrate(forced=false)
       return true if !forced && self.current_build == self.commit
@@ -148,14 +160,29 @@ class Heidi
 
       lines = []
       log.out.lines.each do |line|
-        color_less = line.gsub(/\e\[[^m]+m/, '')
-        commit = color_less.scan(/^[\| \*]+ ([a-z0-9]+)/).flatten.first
-        lines << { :line => line, :build => builds.find(commit) }
+        color_less = line.gsub(/\e\[[^m]*m?/, '')
+        commit = color_less.scan(/^[^a-z0-9]+([a-z0-9]+)/).flatten.first
+        (graph, message) = line.chomp.split(commit)
+        lines << {
+          :line    => line,
+          :commit  => commit,
+          :build   => builds.find(commit),
+          :graph   => graph,
+          :message => message,
+        }
       end
 
       return lines
     end
 
+    def stat(commit)
+      @git.stat(commit)
+    end
+
+    def diff(commit)
+      @git.diff(commit)
+    end
+
     def unlock
       File.unlink lock_file
     end

data/lib/heidi/web/public/css/screen.css

@@ -148,6 +148,9 @@ pre.terminal {
 .terminal a {
   color: inherit;
   text-decoration: none;
+}
+
+.terminal a.build {
   font-weight: bold;
   border-bottom: dashed #ccc 1px;
   margin: 4px 0;
@@ -191,3 +194,9 @@ ul.projects {
   width: 75%;
   overflow: hidden;
 }
+
+label {
+  display: inline-block;
+  min-width: 120px;
+  font-weight: bold;
+}

data/lib/heidi/web/views/build.erb

@@ -1,18 +1,22 @@
 <h1><%= project.name %></h1>
 
-<a href="/projects/<%= project.name %>"><< back</a>
+<a href="/projects/<%= project.basename %>"><< back</a>
 <br /><br />
 
 <h2 class="<%= build.status %>"><%= build.commit %></h2>
-
+<div class="column">
 <% if build.status == "passed" %>
- <a href='/projects/<%= project.name %>/build/<%= build.commit %>/tar_ball'>download</a>
+ <a href='/projects/<%= project.basename %>/build/<%= build.commit %>/tar_ball'>download</a>
 <br /><br />
 <% end %>
 
 | <% build.logs.each do |log| %>
  <a href="#<%= log.file_name %>"><%= log.file_name %></a> |
 <% end %>
+</div>
+<div class="column">
+  <a href="/projects/<%= project.basename %>/commit/<%= build.commit %>">Want to see the commit?</a>
+</div>
 <br class="clear" />
 <br />
 <br />
@@ -20,6 +24,6 @@
 <% build.logs.each do |log| %>
   <h3 class="log"><%= log.file_name %></h3>
   <a name="<%= log.file_name %>" href="#top" class="top">top</a>
-  <pre class="terminal"><%= ansi_color_codes(log.contents) %></pre>
+  <pre class="terminal"><%= ansi_color_codes(h(log.contents)) %></pre>
 <% end %>
 <br /><br />

data/lib/heidi/web/views/commit.erb

@@ -0,0 +1,10 @@
+<h1><%= project.name %></h1>
+
+<a href="/projects/<%= project.basename %>"><< back</a>
+<br /><br />
+
+<h2><%= commit %></h2>
+
+<pre class="terminal"><%= ansi_color_codes(h(stat)) %>
+
+<%= ansi_color_codes(h(diff)) %></pre>

data/lib/heidi/web/views/config.erb

@@ -0,0 +1,21 @@
+<h1>Configure <%= project.name %></h1>
+
+<form method="POST" action="/projects/<%= project.basename %>">
+  <label for="name">Name</label>
+  <input type="text" name="name" value="<%= project.name %>" />
+  <br />
+  <br />
+
+  <label for="branch">Integration branch</label>
+  <select name="branch">
+    <option value="">...</option>
+    <% project.integration_branches.each do |branch| %>
+      <% branch_name = branch.split("/").last %>
+      <option value="<%= branch_name %>" <%= "selected" if branch_name == project.integration_branch %>><%= branch %></option>
+    <% end %>
+  </select>
+
+  <br />
+  <br />
+  <input type="submit" />
+</form>

data/lib/heidi/web/views/home.erb

@@ -2,7 +2,10 @@
   <h1>Projects</h1>
   <ul class="projects">
     <% projects.each do |project| %>
-      <li class="<%= project.build_status %>"><a href="/projects/<%= project.name %>"><%= project.name %></a> - <%= project.build_status %></li>
+      <li class="<%= project.build_status %>">
+        <a href="/projects/<%= project.basename %>"><%= project.name %></a>
+        - <%= project.build_status %>
+      </li>
     <% end %>
   </ul>
 </div>

data/lib/heidi/web/views/project.erb

@@ -9,21 +9,29 @@
   latest  = builds.select { |b| b.commit == project.latest_build }.first
 %>
 
-<h2>Overview</h2>
-<strong class="label">Current</strong> :
-<% unless current.nil? %>
-  <a class="<%= current.status %>" href="/projects/<%= project.name %>/build/<%= current.commit %>"><%= current.commit %></a>
-<% end %>
-<br />
-<strong class="label">Latest successful</strong> :
-<% unless latest.nil? %>
-  <a class="<%= latest.status %>" href="/projects/<%= project.name %>/build/<%= latest.commit %>"><%= latest == current ? "current" : latest.commit %></a>
-<% end %>
-<br />
+<div class="column">
+  <h2>Overview</h2>
+  <strong class="label">Current</strong> :
+  <% unless current.nil? %>
+    <a class="<%= current.status %>" href="/projects/<%= project.basename %>/build/<%= current.commit %>"><%= current.commit %></a>
+  <% end %>
+  <br />
+  <strong class="label">Latest successful</strong> :
+  <% unless latest.nil? %>
+    <a class="<%= latest.status %>" href="/projects/<%= project.basename %>/build/<%= latest.commit %>"><%= latest == current ? "current" : latest.commit %></a>
+  <% end %>
+  <br />
+  <strong class="label">Integration branch</strong> :
+  <%= project.integration_branch %>
+  <br />
+</div>
+<div class="column">
+  <a href="/projects/<%= project.basename %>/configure">Configure <%= project.name %></a>
+</div>
+<br class="clear"/>
 <br />
 <br />
 
 <h2>Build history</h2>
-<pre class="history terminal"><% project.log.each do |line| %><% build = nil; if (build = line[:build]) %><a title="<%= build.author %>" href="/projects/<%= project.name %>/build/<%= build.commit %>"><%= ansi_color_codes(line[:line]).chomp %></a> <span class="status">[<span class="<%= build.status %>"><%= build.status %></span>] (<%= build.date %>, <%= build.author.gsub '<', '&lt;' %>)</span>
-<% else %><%= ansi_color_codes line[:line] %>
-<% end %><% end %></pre>
+<pre class="history terminal"><% project.log.each do |line| %><% build = nil %><%= ansi_color_codes line[:graph] %><a href="/projects/<%= project.basename %>/commit/<%= line[:commit] %>"><%= line[:commit] %></a><% if (build = line[:build]) %><a class="build" href="/projects/<%= project.basename %>/build/<%= build.commit %>"><%= ansi_color_codes(line[:message]) %></a> <span class="status">[<span class="<%= build.status %>"><%= build.status %></span>] (<%= build.date %>, <%= build.author.gsub '<', '&lt;' %>)</span><% else %><%= ansi_color_codes line[:message] %><% end %>
+<% end %></pre>

data/lib/heidi/web.rb

@@ -84,18 +84,52 @@ class Heidi
 
     end
 
-    put '/projects/:name/build' do
-      project = $heidi[params[:name]]
+    get '/projects/:name/commit/:commit' do
+      project = @heidi[params[:name]]
       if project.nil?
         return "no project by that name: #{params[:name]}"
       end
 
-      project.integrate
+      commit = params[:commit]
+
+      erb(:commit, { :locals => {
+        :commit  => commit,
+        :project => project,
+        :stat    => project.stat(commit),
+        :diff    => project.diff(commit),
+      }})
     end
 
+    get '/projects/:name/configure' do
+      project = @heidi[params[:name]]
+      if project.nil?
+        return "no project by that name: #{params[:name]}"
+      end
+
+      erb(:config, { :locals => { :project => project } } )
+    end
+
+    post '/projects/:project_name' do
+      # update project
+      project = @heidi[params[:project_name]]
+      if project.nil?
+        return "no project by that name: #{params[:project_name]}"
+      end
+
+      project.name = params[:name]
+      project.integration_branch = params[:branch]
+
+
+      redirect "/projects/#{project.basename}", 302
+    end
 
     helpers do
+      include Rack::Utils
+      alias_method :h, :escape_html
+
       def ansi_color_codes(string)
+        return "" if string.nil?
+
         string.gsub(/\e\[0?m/, '</span>').
           gsub /\e\[[^m]+m/ do |codes|
             colors = codes.gsub(/[\e\[m]+/, '')

metadata

@@ -1,116 +1,116 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: heidi
-version: !ruby/object:Gem::Version
-  version: 0.2.1
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 0.3.0
 platform: ruby
-authors:
+authors: 
 - Hartog C. de Mik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-09 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-02-14 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: thin
-  requirement: &90563140 !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: *90563140
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: sinatra
-  requirement: &90562840 !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: *90562840
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: simple_shell
-  requirement: &90562490 !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: *90562490
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &90562160 !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *90562160
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: rdoc
-  requirement: &90561910 !ruby/object:Gem::Requirement
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.12'
+      - !ruby/object:Gem::Version 
+        version: "3.12"
   type: :development
   prerelease: false
-  version_requirements: *90561910
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: &90561560 !ruby/object:Gem::Requirement
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *90561560
-- !ruby/object:Gem::Dependency
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &90561290 !ruby/object:Gem::Requirement
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *90561290
-- !ruby/object:Gem::Dependency
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
   name: rcov
-  requirement: &90560970 !ruby/object:Gem::Requirement
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: *90560970
+  version_requirements: *id008
 description: CI-Joe alike CI system called Heidi.
 email: hartog@organisedminds.com
-executables:
+executables: 
 - heidi
-- heidi_console
-- heidi_cron
 - heidi_web
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - LICENSE.txt
 - README.rdoc
-files:
+files: 
 - .document
 - .rspec
 - Gemfile
@@ -120,8 +120,6 @@ files:
 - Rakefile
 - VERSION
 - bin/heidi
-- bin/heidi_console
-- bin/heidi_cron
 - bin/heidi_web
 - heidi.gemspec
 - lib/heidi.rb
@@ -139,6 +137,8 @@ files:
 - lib/heidi/web/public/images/OrganisedMinds.png
 - lib/heidi/web/public/images/heidi.jpeg
 - lib/heidi/web/views/build.erb
+- lib/heidi/web/views/commit.erb
+- lib/heidi/web/views/config.erb
 - lib/heidi/web/views/home.erb
 - lib/heidi/web/views/layout.erb
 - lib/heidi/web/views/project.erb
@@ -153,31 +153,34 @@ files:
 - spec/heidi_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/coffeeaddict/heid
-licenses:
+licenses: 
 - MIT
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 2807118662915516022
+      segments: 
       - 0
-      hash: -727738623
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: A naive CI system
 test_files: []
+

data/bin/heidi_console

@@ -1,3 +0,0 @@
-#!/bin/sh
-
-irb -I $HEIDI_LOAD_PATH -r heidi

data/bin/heidi_cron

@@ -1,8 +0,0 @@
-#!/usr/bin/env ruby
-
-require './lib/heidi'
-
-heidi = Heidi.new
-heidi.projects.each do |project|
-  project.integrate
-end