alphasights-integrity 0.1.9.8 → 0.1.10

data/lib/integrity/installer.rb

@@ -6,6 +6,11 @@ module Integrity
   class Installer < Thor
     include FileUtils
 
+    def self.database_path
+      File.join(ENV["HOME"], ".integrity.sqlite3")
+    end
+    private_class_method :database_path
+
     desc "install [PATH]",
        "Copy template files to PATH for desired deployement strategy
        (either Thin, Passenger or Heroku). Next, go there and edit them."
@@ -37,22 +42,25 @@ module Integrity
     end
 
     desc "launch [CONFIG]",
-         "Launch Integrity real quick."
-    method_options :config => :optional, :port => 4567
+         "Launch Integrity real quick. Database is saved in #{database_path}."
+    method_options :config => :optional, :port => :optional
     def launch
       require "thin"
       require "do_sqlite3"
 
-      File.file?(options[:config].to_s) ?
-        Integrity.new(options[:config]) : Integrity.new
-      Integrity.config[:base_uri] = "http://0.0.0.0:#{options[:port]}"
+      port = options[:port] || 4567
+
+      config = { :database_uri => "sqlite3://#{ENV["HOME"]}/.integrity.db",
+                 :base_uri     => "http://0.0.0.0:#{options[:port]}",
+                 :export_directory => "/tmp/integrity-exports"             }
+      config.merge!(YAML.load_file(options[:config])) if options[:config]
 
-      DataMapper.auto_migrate!
+      migrate_db(config)
 
-      Thin::Server.start("0.0.0.0", options[:port], Integrity::App)
+      Thin::Server.start("0.0.0.0", port, Integrity::App)
     rescue LoadError => boom
-      missing_dependency = boom.message.split("--").last.lstrip
-      puts "Please install #{missing_dependency} to launch Integrity"
+      $stderr << "Make sure thin and do_sqlite3 are insatalled\n\n"
+      raise
     end
 
     private
@@ -101,8 +109,9 @@ Your Integrity install is ready to be deployed onto Heroku. Next steps:
 
   1. git init && git add . && git commit -am "Initial import"
   2. heroku create
-  3. git push heroku master
-  4. heroku rake db:migrate
+  3. Add heroku-given domain as :base_uri in integrity-config.rb
+  4. git push heroku master
+  5. heroku rake db:migrate
 EOF
       end
 

data/lib/integrity/migrations.rb

@@ -39,9 +39,9 @@ module Integrity
           column :id,          Integer,  :serial => true
           column :name,        String,   :nullable => false
           column :permalink,   String
-          column :uri,         Text,      :nullable => false
+          column :uri,         URI,      :nullable => false
           column :branch,      String,   :nullable => false, :default => "master"
-          column :command,     Text,   :nullable => false, :default => "rake"
+          column :command,     String,   :nullable => false, :default => "rake"
           column :public,      Boolean,                      :default  => true
           column :building,    Boolean,                      :default  => false
           column :created_at,  DateTime
@@ -83,12 +83,12 @@ module Integrity
 
         create_table :integrity_commits do
           column :id,           Integer,  :serial => true
-          column :identifier,   String,   :size => 40, :nullable => false
-          column :message,      Text,     :nullable => true
-          column :author,       String,   :nullable => true, :length => 255
+          column :identifier,   String,   :nullable => false
+          column :message,      String,   :nullable => false, :length => 255
+          column :author,       String,   :nullable => false, :length => 255
           column :committed_at, DateTime, :nullable => false
-          column :created_at,   DateTime
-          column :updated_at,   DateTime
+          column :created_at,  DateTime
+          column :updated_at,  DateTime
 
           column :project_id,   Integer
         end
@@ -124,7 +124,6 @@ module Integrity
             commit = Commit.create(:identifier   => build.commit_identifier,
                                    :message      => build.commit_metadata[:message],
                                    :author       => build.commit_metadata[:author],
-                                   :url          => build.commit_metadata[:url],
                                    :committed_at => build.commit_metadata[:date],
                                    :project_id   => build.project_id)
           end
@@ -149,14 +148,45 @@ module Integrity
       end
     end
 
-    migration 4, :add_url_to_commits do
+      migration 4, :add_commit_uri_column do
+        up do
+          modify_table(:integrity_commits) { add_column :uri, URI }
+        end
+
+        down do
+          #modify_table(:integrity_commits) { add_column :changeset, String }
+        end
+      end
+    end
+    
+    migration 5, :nil_commit_metadata do
       up do
-        modify_table(:integrity_commits) { add_column :url, Text }
+        all_commits = Commit.all.collect { |c| c.dup }
+        drop_table :integrity_commits
+
+        create_table :integrity_commits do
+          column :id,           Integer,  :serial => true
+          column :identifier,   String,   :nullable => false
+          column :message,      String,   :nullable => true, :length => 255
+          column :author,       String,   :nullable => true, :length => 255
+          column :committed_at, DateTime, :nullable => false
+          column :created_at,  DateTime
+          column :updated_at,  DateTime
+
+          column :project_id,   Integer
+        end
+
+        all_commits.each { |commit| Commit.create(commit.attributes) }
       end
+    end
 
-      down do
-        #modify_table(:integrity_commits) { drop_column :url }
+=begin
+TODO: drop the :building column of the project table
+
+    migration 5, :remove_building_column do
+      up do
+        modify_table(:integrity_projects) { drop_column :building }
       end
     end
-  end
+=end
 end

data/lib/integrity/notifier.rb

@@ -33,7 +33,7 @@ module Integrity
     private_class_method :valid?
 
     def notify_of_build(build)
-      to_const.notify_of_build(build, config)
+      to_const.notify_of_build(build, config) if to_const
     end
 
     private

data/lib/integrity/notifier/base.rb

@@ -2,10 +2,10 @@ module Integrity
   class Notifier
     class Base
       def self.notify_of_build(build, config)
-        Integrity.log "Notifying of build #{build.commit.short_identifier} using the #{self} notifier"
+        Integrity.log "Notifying of build #{build.commit.short_identifier} using the #{to_s} notifier"
         Timeout.timeout(8) { new(build.commit, config).deliver! }
       rescue Timeout::Error
-        Integrity.log "#{self} notifier timed out"
+        Integrity.log "#{notifier.name} notifier timed out"
         false
       end
 

data/lib/integrity/notifier/test/fixtures.rb

@@ -24,8 +24,7 @@ Integrity::Project.fixture do
     :uri        => "git://github.com/#{/\w+/.gen}/#{name}.git",
     :branch     => ["master", "test-refactoring", "lh-34"].pick,
     :command    => ["rake", "make", "ant -buildfile test.xml"].pick,
-    :public     => [true, false].pick,
-    :building   => [true, false].pick }
+    :public     => [true, false].pick }
 end
 
 Integrity::Project.fixture(:integrity) do
@@ -33,8 +32,7 @@ Integrity::Project.fixture(:integrity) do
     :uri        => "git://github.com/foca/integrity.git",
     :branch     => "master",
     :command    => "rake",
-    :public     => true,
-    :building   => false }
+    :public     => true }
 end
 
 Integrity::Project.fixture(:my_test_project) do
@@ -42,8 +40,7 @@ Integrity::Project.fixture(:my_test_project) do
     :uri        => File.dirname(__FILE__) + "/../../",
     :branch     => "master",
     :command    => "./test",
-    :public     => true,
-    :building   => false }
+    :public     => true }
 end
 
 Integrity::Commit.fixture do
@@ -68,6 +65,10 @@ Integrity::Commit.fixture(:pending) do
   Integrity::Commit.generate_attributes.update(:build => Integrity::Build.gen(:pending))
 end
 
+Integrity::Commit.fixture(:building) do
+  Integrity::Commit.generate_attributes.update(:build => Integrity::Build.gen(:building))
+end
+
 Integrity::Build.fixture do
   commit = Integrity::Commit.first || Integrity::Commit.gen
 
@@ -91,6 +92,11 @@ Integrity::Build.fixture(:pending) do
   Integrity::Build.generate_attributes.update(:successful => nil, :started_at => nil, :completed_at => nil)
 end
 
+Integrity::Build.fixture(:building) do
+  Integrity::Build.generate_attributes.update(:completed_at => nil,
+    :successful => nil, :output => nil)
+end
+
 Integrity::Notifier.fixture(:irc) do
   create_notifier! "IRC"
 

data/lib/integrity/project.rb

@@ -4,33 +4,50 @@ require "integrity/project/push"
 module Integrity
   class Project
     include DataMapper::Resource
+    include Bob::Buildable
     include Notifiers, Push
 
-    property :id,         Integer,  :serial => true
+    property :id,         Serial
     property :name,       String,   :nullable => false
     property :permalink,  String
     property :uri,        URI,      :nullable => false, :length => 255
     property :branch,     String,   :nullable => false, :default => "master"
-    property :command,    Text,   :nullable => false, :default => "rake"
+    property :command,    String,   :nullable => false, :length => 255, :default => "rake"
     property :public,     Boolean,  :default => true
-    property :building,   Boolean,  :default => false
-    property :created_at, DateTime
-    property :updated_at, DateTime
 
-    has n, :commits, :class_name => "Integrity::Commit",
-                     :order => [:committed_at.desc]
+    timestamps :at
+
+    default_scope(:default).update(:order => [:name.asc])
+
+    has n, :commits, :class_name => "Integrity::Commit"
     has n, :notifiers, :class_name => "Integrity::Notifier"
 
     before :save, :set_permalink
-    before :destroy, :delete_working_directory
+
+    before :destroy do
+      commits.destroy!
+    end
 
     validates_is_unique :name
 
-    def build(commit_identifier="HEAD")
-      commit_identifier = head_of_remote_repo if commit_identifier == "HEAD"
-      commit = find_or_create_commit_with_identifier(commit_identifier)
+    def kind
+      :git
+    end
+
+    alias_method :build_script, :command
+
+    def start_building(commit_id, commit_info)
+      @commit = commits.first_or_create({:identifier => commit_id},
+        commit_info.update(:project_id => id))
+      @build  = Build.new(:started_at => Time.now)
+      @commit.update_attributes(:build => @build)
+    end
 
-      Build.queue(commit)
+    def finish_building(commit_id, status, output)
+      @build.update_attributes(
+        :successful => status, :output => output,
+        :completed_at => Time.now) if @build
+      enabled_notifiers.each { |notifier| notifier.notify_of_build(@build) }
     end
 
     def last_commit
@@ -42,8 +59,12 @@ module Integrity
         tap {|commits| commits.shift }
     end
 
+    def building?
+      commits.any? { |c| c.building? }
+    end
+
     def status
-      last_commit && last_commit.status
+      last_commit ? last_commit.status : :blank
     end
 
     def human_readable_status
@@ -58,24 +79,6 @@ module Integrity
     end
 
     private
-      def find_or_create_commit_with_identifier(identifier)
-        # We abuse +committed_at+ here setting it to Time.now because we use it
-        # to sort (for last_commit and previous_commits). I don't like this
-        # very much, but for now it's the only solution I can find.
-        #
-        # This also creates a dependency, as now we *always* have to update the
-        # +committed_at+ field after building to ensure the date is correct :(
-        #
-        # This might also make your commit listings a little jumpy, if some
-        # commits change place every time a build finishes =\
-        commits.first_or_create({:identifier => identifier, :project_id => id},
-          :committed_at => Time.now)
-      end
-
-      def head_of_remote_repo
-        SCM.new(uri, branch).head
-      end
-
       def set_permalink
         attribute_set(:permalink, (name || "").downcase.
           gsub(/'s/, "s").
@@ -83,12 +86,5 @@ module Integrity
           gsub(/[^a-z0-9]+/, "-").
           gsub(/-*$/, ""))
       end
-
-      def delete_working_directory
-        commits.destroy!
-        ProjectBuilder.delete_working_directory(self)
-      rescue SCM::SCMUnknownError => error
-        Integrity.log "Problem while trying to deleting code: #{error}"
-      end
   end
 end

data/lib/integrity/project/push.rb

@@ -13,9 +13,8 @@ module Integrity
           end
 
         commits.each { |commit_data|
-          commit = commit_from(commit_data)
-          commit.create
-          build(commit.identifier)
+          commit_from(commit_data).create
+          build(commit_data["id"])
         }
       end
 
@@ -24,8 +23,8 @@ module Integrity
           commits.new(:identifier => data["id"],
             :author  => "#{data["author"]["name"]} <#{data["author"]["email"]}>",
             :message => data["message"],
-            :url => data["url"],
-            :committed_at => data["timestamp"])
+            :committed_at => data["timestamp"],
+            :uri => data["url"])
         end
 
         def valid_payload?(payload)

data/test/acceptance/api_test.rb

@@ -33,7 +33,7 @@ class ApiTest < Test::Unit::AcceptanceTestCase
     assert_contain("No builds for this project")
   end
 
-  it "receiving a build request with build_all_commits *enabled* builds all commits, most recent first" do
+  scenario "receiving a build request with build_all_commits *enabled* builds all commits, most recent first" do
     Integrity.config[:build_all_commits] = true
 
     repo = git_repo(:my_test_project) # initial commit && successful commit

data/test/acceptance/browse_project_test.rb

@@ -30,15 +30,21 @@ class BrowsePublicProjectsTest < Test::Unit::AcceptanceTestCase
   scenario "a user can see the projects status on the home page" do
     integrity = Project.gen(:integrity, :commits => 3.of { Commit.gen(:successful) })
     test      = Project.gen(:my_test_project, :commits => 2.of { Commit.gen(:failed) })
-    no_build  = Project.gen(:public => true, :building => false)
-    building  = Project.gen(:public => true, :building => true)
+    no_build  = Project.gen(:name => "none yet", :public => true)
+    building  = Project.gen(:name => "building", :public => true,
+                            :commits => 1.of{ Commit.gen(:building) })
 
     visit "/"
 
-    assert_contain("Built #{integrity.last_commit.short_identifier} successfully")
-    assert_contain("Built #{test.last_commit.short_identifier} and failed")
-    assert_contain("Never built yet")
-    assert_contain("Building!")
+    assert_have_tag("li[@class~=success]",
+      :content => "Built #{integrity.last_commit.short_identifier} successfully")
+
+    assert_have_tag("li[@class~=failed]",
+      :content => "Built #{test.last_commit.short_identifier} and failed")
+
+    assert_have_tag("li[@class~=blank]", :content => "Never built yet")
+
+    assert_have_tag("li[@class~=building]", :content => "Building!")
   end
 
   scenario "a user clicking through a link on the home page for a public project arrives at the project page" do

data/test/acceptance/build_notifications_test.rb

@@ -1,6 +1,5 @@
 require File.dirname(__FILE__) + "/../helpers/acceptance"
 require "helpers/acceptance/notifier_helper"
-require "helpers/acceptance/textfile_notifier"
 require "helpers/acceptance/email_notifier"
 
 class BuildNotificationsTest < Test::Unit::AcceptanceTestCase
@@ -14,7 +13,11 @@ class BuildNotificationsTest < Test::Unit::AcceptanceTestCase
 
   before(:each) do
     # This is needed before any available notifier is unset
-    # in the global #before
+    # in the global #before.
+    # But, we need the reload this one because we remove_const
+    # it in a test case. Sigh.
+    load "helpers/acceptance/textfile_notifier.rb"
+
     Notifier.register(Integrity::Notifier::Textfile)
     Notifier.register(Integrity::Notifier::Email)
   end
@@ -79,6 +82,27 @@ class BuildNotificationsTest < Test::Unit::AcceptanceTestCase
     assert_have_email_notifier
   end
 
+  scenario "an admin enables the Textfile notifier and get rid of it later" do
+    git_repo(:my_test_project).add_successful_commit
+    Project.gen(:my_test_project, :uri => git_repo(:my_test_project).path)
+
+    login_as "admin", "test"
+    visit "/my-test-project"
+
+    click_link "Edit Project"
+    check "enabled_notifiers_textfile"
+    fill_in "File", :with => "/tmp/textfile_notifications.txt"
+    click_button "Update Project"
+
+    Notifier.send(:remove_const, :Textfile)
+    Notifier.available.clear
+    rm_f "/tmp/textfile_notifications.txt"
+
+    click_button "manual build"
+
+    assert ! File.file?("/tmp/textfile_notifications.txt")
+  end
+
   scenario "an admin configures various notifiers accros multiple projects" do
     Project.first(:permalink => "integrity").should be_nil
 

data/test/acceptance/installer_test.rb

@@ -70,7 +70,7 @@ class InstallerTest < Test::Unit::AcceptanceTestCase
   scenario "Installing Integrity for Heroku" do
     message = install("--heroku")
 
-    assert_equal "integrity --version 0.1.9.0", root.join(".gems").read.chomp
+    assert_equal "integrity --version 0.1.9.3", root.join(".gems").read.chomp
 
     assert root.join("Rakefile").file?
     assert root.join("integrity-config.rb").file?