ciquantum 0.0.3 → 0.0.6

data/README.md

@@ -24,12 +24,12 @@ At current moment gem uses Unfuddle adapter, and must be configured for proper w
 Expected options:
 -----------------
 
-  git config --add ciquantum.runner "command to do on build"
-  git config --add ciquantum.branch branch_name
-  git config --add ciquantum.buildqueue true
-  git config --add ciquantum.projectname project_name_to_show
-  git config --add ciquantum.coverage_path relative_path_to_coverage_report
-
- *Unfuddle (default) adapter:*
-  git config --add ciquantum.unfuddle.project unfuddle_user_name
-  git config --add ciquantum.unfuddle.user unfuddle_project_id
+    git config --add ciquantum.runner "command to do on build"
+    git config --add ciquantum.branch branch_name
+    git config --add ciquantum.buildqueue true
+    git config --add ciquantum.projectname project_name_to_show
+    git config --add ciquantum.coverage_path relative_path_to_coverage_report
+
+Unfuddle (default) adapter:
+    git config --add ciquantum.unfuddle.project unfuddle_user_name
+    git config --add ciquantum.unfuddle.user unfuddle_project_id

data/bin/ciquantum

@@ -18,7 +18,7 @@ Choice.options do
   end
 
   option :port do
-    d = 4567
+    d = 5555
     short '-p'
     long '--port=PORT'
     desc "The port to listen on (default #{d})"

data/ciquantum.gemspec

@@ -24,6 +24,8 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency     'tinder', '>= 1.4.0'
   gem.add_runtime_dependency     'sinatra'
   gem.add_runtime_dependency     'choice'
+  gem.add_runtime_dependency     'pony'
+  gem.add_runtime_dependency     'sq_auth', '>= 0.0.21'
   gem.add_development_dependency 'rack-test'
   gem.add_development_dependency 'mocha'
 

data/lib/ciquantum.rb

@@ -1,228 +1,16 @@
 
 require 'ciquantum/version'
 require 'ciquantum/config'
-require 'ciquantum/adapter'
+require 'ciquantum/unfuddle'
+require 'ciquantum/unfuddle/changeset'
 require 'ciquantum/commit'
 require 'ciquantum/build'
 require 'ciquantum/server'
 require 'ciquantum/queue'
+require 'ciquantum/core'
 
-
-class CIQuantum
-  attr_reader :user
-  attr_reader :project
-  attr_reader :url
-  attr_reader :current_build
-  attr_reader :last_build
-  attr_reader :campfire
-  attr_reader :projectname
-  attr_reader :coverage_path
-
-  def initialize(project_path)
-    @project_path = File.expand_path(project_path)
-
-    @user, @project = git_user_and_project
-    @url = project_url
-    @projectname = repo_config.projectname.to_s
-    @coverage_path = repo_config.coveragepath.to_s
-
-    @last_build = nil
-    @current_build = nil
-    @queue = Queue.new(!repo_config.buildqueue.to_s.empty?, true)
-
-    trap("INT") { stop }
-  end
-
-  # is a build running?
-  def building?
-    !!@current_build
-  end
-
-  # the pid of the running child process
-  def pid
-    building? and current_build.pid
-  end
-
-  # kill the child and exit
-  def stop
-    Process.kill(9, pid) if pid
-    exit!
-  end
-
-  # build callbacks
-  def build_failed(output, error)
-    finish_build :failed, "#{error}\n\n#{output}"
-    run_hook "build-failed"
-  end
-
-  def build_worked(output)
-    finish_build :worked, output
-    run_hook "build-worked"
-  end
-
-  def finish_build(status, output)
-    @current_build.finished_at = Time.now
-    @current_build.status = status
-    @current_build.output = output
-    @last_build = @current_build
-
-    @current_build = nil
-    write_build 'current', @current_build
-    write_build 'last', @last_build
-
-    build(@queue.next_branch_to_build) if @queue.waiting?
-  end
-
-  # run the build but make sure only one is running
-  # at a time (if new one comes in we will park it)
-  def build(branch=nil)
-    if building?
-      @queue.append_unless_already_exists(branch)
-      # leave anyway because a current build runs
-      return
-    end
-    @current_build = Build.new(@project_path, @user, @project)
-    write_build 'current', @current_build
-    Thread.new { build!(branch) }
-  end
-
-  def open_pipe(cmd)
-    read, write = IO.pipe
-
-    pid = fork do
-      read.close
-      $stdout.reopen write
-      exec cmd
-    end
-
-    write.close
-
-    yield read, pid
-  end
-
-  # update git then run the build
-  def build!(branch=nil)
-    @git_branch = branch
-    build = @current_build
-    output = ''
-    git_update
-    build.sha = git_sha
-    build.branch = git_branch
-    write_build 'current', build
-
-    open_pipe("cd #{@project_path} && #{runner_command} 2>&1") do |pipe, pid|
-      puts "#{Time.now.to_i}: Building #{build.branch} at #{build.short_sha}: pid=#{pid}"
-
-      build.pid = pid
-      write_build 'current', build
-      output = pipe.read
-    end
-
-    Process.waitpid(build.pid, 1)
-    status = $?.exitstatus.to_i
-    @current_build = build
-    puts "#{Time.now.to_i}: Built #{build.short_sha}: status=#{status}"
-
-    status == 0 ? build_worked(output) : build_failed('', output)
-  rescue Object => e
-    puts "Exception building: #{e.message} (#{e.class})"
-    build_failed('', e.to_s)
-  end
-
-  # shellin' out
-  def runner_command
-    runner = repo_config.runner.to_s
-    runner == '' ? "rake -s test:units" : runner
-  end
-
-  def git_sha
-    `cd #{@project_path} && git rev-parse origin/#{git_branch}`.chomp
-  end
-
-  def git_update
-    `cd #{@project_path} && git fetch origin && git reset --hard origin/#{git_branch}`
-    run_hook "after-reset"
-  end
-
-  def git_user_and_project
-    adapter_config = repo_config.send Adapter.default_adapter.name
-    Adapter.default_adapter.git_user_and_project adapter_config
-  end
-
-  def project_url
-    Adapter.default_adapter.project_url @user, @project
-  end
-
-  def git_branches
-    branches = `cd #{@project_path} && git branch -r`.split("\n")
-    branches.collect{|s| s =~ /(?:\s|^)origin\/(?!HEAD)(\w+)(?:\s|$)/ ? $1.strip : nil}.compact
-  end
-
-  def git_branch
-    return @git_branch if @git_branch
-    branch = repo_config.branch.to_s
-    @git_branch = branch == '' ? "master" : branch
-  end
-
-  # massage our repo
-  def run_hook(hook)
-    if File.exists?(file=path_in_project(".git/hooks/#{hook}")) && File.executable?(file)
-      data =
-        if @last_build && @last_build.commit
-          {
-            "MESSAGE" => @last_build.commit.message,
-            "AUTHOR" => @last_build.commit.author,
-            "SHA" => @last_build.commit.sha,
-            "OUTPUT" => @last_build.env_output
-          }
-        else
-          {}
-        end
-
-      orig_ENV = ENV.to_hash
-      ENV.clear
-      data.each{ |k, v| ENV[k] = v }
-      output = `cd #{@project_path} && #{file}`
-
-      ENV.clear
-      orig_ENV.to_hash.each{ |k, v| ENV[k] = v}
-      output
-    end
-  end
-
-  # restore current / last build state from disk.
-  def restore
-    @last_build = read_build('last')
-    @current_build = read_build('current')
-
-    Process.kill(0, @current_build.pid) if @current_build && @current_build.pid
-  rescue Errno::ESRCH
-    # build pid isn't running anymore. assume previous
-    # server died and reset.
-    @current_build = nil
-  end
-
-  def path_in_project(path)
-    File.join(@project_path, path)
-  end
-
-  # write build info for build to file.
-  def write_build(name, build)
-    filename = path_in_project(".git/builds/#{name}")
-    Dir.mkdir path_in_project('.git/builds') unless File.directory?(path_in_project('.git/builds'))
-    if build
-      build.dump filename
-    elsif File.exist?(filename)
-      File.unlink filename
-    end
-  end
-
-  def repo_config
-    Config.ciquantum(@project_path)
-  end
-
-  # load build info from file.
-  def read_build(name)
-    Build.load(path_in_project(".git/builds/#{name}"), @project_path)
+module CIQuantum
+  def self.new *args
+    CIQuantum::Core.new *args
   end
 end

data/lib/ciquantum/build.rb

@@ -1,6 +1,6 @@
 require 'yaml'
 
-class CIQuantum
+module CIQuantum
   class Build < Struct.new(:project_path, :user, :project, :started_at, :finished_at, :sha, :status, :output, :pid, :branch)
     def initialize(*args)
       super
@@ -51,13 +51,14 @@ class CIQuantum
       @commit ||= Commit.new(sha, user, project, project_path)
     end
 
-    def dump(file)
+    def dump file
       config = [user, project, started_at, finished_at, sha, status, output, pid, branch]
       data = YAML.dump(config)
       File.open(file, 'wb') { |io| io.write(data) }
     end
 
-    def self.load(file, project_path)
+    def self.load file, project_path
+      puts "Loading build from file: #{file}"
       if File.exist?(file)
         config = YAML.load(File.read(file)).unshift(project_path)
         new *config

data/lib/ciquantum/commit.rb

@@ -1,7 +1,7 @@
-class CIQuantum
+module CIQuantum
   class Commit < Struct.new(:sha, :user, :project, :project_path)
     def url
-      Adapter::default_adapter.commit_url self
+      Unfuddle.commit_url self
     end
 
     def author

data/lib/ciquantum/config.rb

@@ -1,4 +1,4 @@
-class CIQuantum
+module CIQuantum
   class Config
     def self.method_missing(command, *args)
       new(command, *args)

data/lib/ciquantum/core.rb

@@ -0,0 +1,268 @@
+module CIQuantum
+  class Core
+    attr_reader :user
+    attr_reader :project
+    attr_reader :url
+    attr_reader :current_build
+    attr_reader :last_build
+    attr_reader :campfire
+    attr_reader :projectname
+    attr_reader :coverage_path
+
+    HistoryLimit = 10
+
+    def initialize(project_path)
+      @project_path = File.expand_path(project_path)
+
+      @user, @project = git_user_and_project
+      @url = project_url
+      @projectname = repo_config.projectname.to_s
+      @coverage_path = repo_config.coveragepath.to_s
+
+      @last_build = nil
+      @current_build = nil
+      @queue = Queue.new(!repo_config.buildqueue.to_s.empty?, true)
+
+      trap("INT") { stop }
+    end
+
+    # is a build running?
+    def building?
+      !!@current_build
+    end
+
+    # the pid of the running child process
+    def pid
+      building? and current_build.pid
+    end
+
+    # kill the child and exit
+    def stop
+      Process.kill(9, pid) if pid
+      exit!
+    end
+
+    # build callbacks
+    def build_failed(output, error)
+      finish_build :failed, "#{error}\n\n#{output}"
+      run_hook "build-failed"
+    end
+
+    def build_worked(output)
+      finish_build :worked, output
+      run_hook "build-worked"
+    end
+
+    def finish_build(status, output)
+      @current_build.finished_at = Time.now
+      @current_build.status = status
+      @current_build.output = output
+      @last_build = @current_build
+
+      @current_build = nil
+      write_current_build
+      write_last_build
+      run_hook "postbuild"
+
+      build(@queue.next_branch_to_build) if @queue.waiting?
+    end
+
+    def build(branch=nil)
+      if building?
+        @queue.append_unless_already_exists(branch)
+        # leave anyway because a current build runs
+        return
+      end
+      @current_build = Build.new(@project_path, @user, @project)
+      write_current_build
+
+      Thread.new {
+        build!(branch)
+      }
+
+    end
+
+    def open_pipe(cmd)
+      read, write = IO.pipe
+
+      pid = fork do
+        read.close
+        $stdout.reopen write
+        exec cmd
+      end
+
+      write.close
+
+      yield read, pid
+    end
+
+    # update git then run the build
+    def build!(branch=nil)
+      @git_branch = branch
+      build = @current_build
+      run_hook "prebuild"
+      git_update
+      output = ''
+      build.sha = git_sha
+      build.branch = git_branch
+      write_build 'current', build
+
+      open_pipe("cd #{@project_path} && #{runner_command} 2>&1") do |pipe, pid|
+        puts "#{Time.now.to_i}: Building #{build.branch} at #{build.short_sha}: pid=#{pid}"
+
+        build.pid = pid
+        write_build 'current', build
+        output = pipe.read
+      end
+
+      Process.waitpid(build.pid, 1)
+      status = $?.exitstatus.to_i
+      @current_build = build
+      puts "#{Time.now.to_i}: Built #{build.short_sha}: status=#{status}"
+
+      status == 0 ? build_worked(output) : build_failed('', output)
+    rescue Object => e
+      puts "Exception building: #{e.message} (#{e.class})"
+      build_failed('', e.to_s)
+    end
+
+    # shellin' out
+    def runner_command
+      runner = repo_config.runner.to_s
+      runner == '' ? "rake -s test:units" : runner
+    end
+
+    def git_update
+      `cd #{@project_path} && git fetch origin && git reset --hard origin/#{git_branch}`
+      run_hook "after-reset"
+    end
+
+    def git_user_and_project
+      config = repo_config.send Unfuddle.name
+      Unfuddle.git_user_and_project config
+    end
+
+    def project_url
+      Unfuddle.project_url @user, @project
+    end
+
+    # massage our repo
+    def run_hook(hook)
+      if File.exists?(file=path_in_project(".git/hooks/#{hook}")) && File.executable?(file)
+        data =
+          if @last_build && @last_build.commit
+            {
+              "MESSAGE" => @last_build.commit.message,
+              "AUTHOR" => @last_build.commit.author,
+              "SHA" => @last_build.commit.sha,
+              "URL" => @last_build.commit.url,
+              "OUTPUT" => @last_build.env_output
+            }
+          else
+            {}
+          end
+
+        orig_ENV = ENV.to_hash
+        # ENV.clear
+        data.each{ |k, v| ENV[k] = v }
+        puts "Executing hook: #{file}"
+        output = `cd #{@project_path} && #{file}`
+
+        ENV.clear
+        orig_ENV.to_hash.each{ |k, v| ENV[k] = v}
+        output
+      end
+    end
+
+    # restore current / last build state from disk.
+    def restore
+      @last_build = read_last_build
+      @current_build = read_current_build
+
+      Process.kill(0, @current_build.pid) if @current_build && @current_build.pid
+    rescue Errno::ESRCH
+      @current_build = nil
+    end
+
+    def path_in_project(path)
+      File.join(@project_path, path)
+    end
+
+    def repo_config
+      Config.ciquantum(@project_path)
+    end
+
+    def swith_branch branch
+      repo_config.branch.set branch if git_branches.include? branch
+    end
+
+    def git_branches
+      branches = `cd #{@project_path} && git branch -r`.split("\n")
+      branches.collect{|s| s =~ /(?:\s|^)origin\/(?!HEAD)(\w+)(?:\s|$)/ ? $1.strip : nil}.compact
+    end
+
+    def git_branch
+      return @git_branch if @git_branch
+      branch = repo_config.branch.to_s
+      @git_branch = (branch == '' ? "master" : branch)
+    end
+
+    def git_sha
+      `cd #{@project_path} && git rev-parse origin/#{git_branch}`.chomp
+    end
+
+    def read_build(name)
+      Build.load(path_in_project(".git/builds/#{name}"), @project_path)
+    end
+
+    def read_last_build
+      read_build_by_index 0
+    end
+
+    def read_current_build
+      read_build 'current'
+    end
+
+    def read_build_by_index index
+      read_build old_builds[index] if old_builds[index]
+    end
+
+    def old_builds
+      Dir.glob(path_in_project(".git/builds/*")).collect do |f|
+        File.basename(f)
+      end.select do |f|
+        f =~ /\d+/
+      end.sort.reverse
+    end
+
+    def write_last_build
+      write_build @last_build.finished_at.to_i.to_s, @last_build
+    end
+
+    def write_current_build
+      write_build 'current', @current_build
+    end
+
+    def write_build(name, build)
+      filename = path_in_project(".git/builds/#{name}")
+      Dir.mkdir path_in_project('.git/builds') unless File.directory?(path_in_project('.git/builds'))
+      if build
+        build.dump filename
+      elsif File.exist?(filename)
+        File.unlink filename
+      end
+      remove_unused_build
+    end
+
+    def remove_unused_build
+      builds = old_builds
+      if builds.size > HistoryLimit
+        builds[HistoryLimit..builds.size].each do |file|
+          file = path_in_project(".git/builds/#{file}")
+          File.delete file if File.exists? file
+        end
+      end
+    end
+
+  end
+end

data/lib/ciquantum/queue.rb

@@ -1,8 +1,5 @@
-class CIQuantum
-  # An in memory queue used for maintaining an order list of requested
-  # builds.
+module CIQuantum
   class Queue
-    # enabled - determines whether builds should be queued or not.
     def initialize(enabled, verbose=false)
       @enabled = enabled
       @verbose = verbose
@@ -11,13 +8,6 @@ class CIQuantum
       log("Build queueing enabled") if enabled
     end
 
-    # Public: Appends a branch to be built, unless it already exists
-    # within the queue.
-    #
-    # branch - the name of the branch to build or nil if the default
-    #         should be built.
-    #
-    # Returns nothing
     def append_unless_already_exists(branch)
       return unless enabled?
       unless @queue.include? branch
@@ -26,15 +16,12 @@ class CIQuantum
       end
     end
 
-    # Returns a String of the next branch to build
     def next_branch_to_build
       branch = @queue.shift
       log "#{Time.now.to_i}: De-queueing #{branch}"
       branch
     end
 
-    # Returns true if there are requested builds waiting and false
-    # otherwise.
     def waiting?
       if enabled?
         not @queue.empty?

data/lib/ciquantum/server.rb

@@ -1,9 +1,16 @@
-require 'sinatra/base'
 require 'erb'
 require 'json'
 
-class CIQuantum
+require 'sinatra'
+require 'sq_auth'
+
+module CIQuantum
   class Server < Sinatra::Base
+
+    SqAuth.connect(host: "sqauth.socialquantum.com", port: 443) do |config|
+      config.project_name = "Enchanted"
+    end
+
     attr_reader :quantum
 
     dir = File.dirname(File.expand_path(__FILE__))
@@ -13,6 +20,9 @@ class CIQuantum
     set :static, true
     set :lock, true
 
+    enable :static
+    enable :sessions
+
     before { quantum.restore }
 
     get '/ping' do
@@ -23,33 +33,35 @@ class CIQuantum
       quantum.last_build.sha
     end
 
-    get '/?' do
-      erb(:template, {}, :quantum => quantum)
+    get ["ci::view", "ci::change_branch"], '/?' do
+      erb(:template, {}, :quantum => quantum, :can_change_branch => accessed_by?("ci::change_branch"))
     end
 
-    post '/?' do
-      puts params
-      unless params[:rebuild]
-        payload = JSON.parse(params[:payload])
-        pushed_branch = payload["ref"].split('/').last
+    sq_auth_access do
+      access_action "/build" do
+        execute_for "ci::view"
       end
-
-      # Only build if we were given an explicit branch via `?branch=blah`
-      # or the payload exists and the "ref" property matches our
-      # specified build branch.
-      if params[:branch] || params[:rebuild] || pushed_branch == quantum.git_branch
-        quantum.build(params[:branch])
+      access_action "/switch_branch" do
+        execute_for "ci::admin"
       end
+    end
 
-      if params[:switch] == "Switch branch"
-        quantum.repo_config.branch.set params[:branch] if quantum.git_branches.include? params[:branch]
-      end
+    post '/build' do
+      quantum.build quantum.repo_config.branch
+
+      link_coverage_path
+      redirect '/'
+    end
 
+    post '/switch_branch' do
+      quantum.swith_branch params[:branch]
+      quantum.build params[:branch]
 
-      redirect request.path
+      link_coverage_path
+      redirect '/'
     end
 
-    get '/api/json' do
+    get ["ci::view"], '/api/json' do
         response  = [200, {'Content-Type' => 'application/json'}]
         response_json = erb(:json, {}, :quantum => quantum)
       if params[:jsonp]
@@ -60,8 +72,20 @@ class CIQuantum
       response
     end
 
-    get '/coverage' do
-      redirect quantum.coverage_path
+    post '/push' do
+      begin
+        xml = request.body.read
+        changeset = Unfuddle::Changeset.new(xml)
+        quantum.build quantum.repo_config.branch
+        link_coverage_path
+      rescue Unfuddle::ChangesetError => e
+        logger.error "[error] Changeset error: #{e.inspect}, Content: #{xml.inspect}"
+        halt 400, "Changeset Error: #{e.message}"
+      end
+    end
+
+    get ["ci::view"], '/coverage?' do
+      redirect "coverage/index.html"
     end
 
     helpers do
@@ -83,6 +107,7 @@ class CIQuantum
         root = "" if root == "/"
         root
       end
+
     end
 
     def initialize(*args)
@@ -101,14 +126,17 @@ class CIQuantum
       self.new
     end
 
-    def self.project_path=(project_path)
-      user, pass = Config.ciquantum(project_path).user.to_s, Config.ciquantum(project_path).pass.to_s
-      if user != '' && pass != ''
-        use Rack::Auth::Basic do |username, password|
-          [ username, password ] == [ user, pass ]
-        end
-        puts "Using HTTP basic auth"
+    def link_coverage_path
+      public_coverage_path = File.join settings.public_folder, "coverage"
+      project_coverage_path = File.join settings.project_path, quantum.coverage_path
+
+      File.unlink public_coverage_path if File.exists? public_coverage_path
+      if !quantum.coverage_path.empty? and File.exists? project_coverage_path
+        File.symlink project_coverage_path, public_coverage_path
       end
+    end
+
+    def self.project_path=(project_path)
       set :project_path, Proc.new{project_path}, true
     end
 

data/lib/ciquantum/{unfuddle_adapter.rb → unfuddle.rb}

@@ -1,5 +1,5 @@
-class CIQuantum
-  class UnfuddleAdapter
+module CIQuantum
+  module Unfuddle
 
     def self.name
       "unfuddle"
@@ -10,12 +10,12 @@ class CIQuantum
     end
 
     def self.git_user_and_project config
-        [ (config.user.empty? ? "linkfeed" : config.user), (config.project.empty? ? "17607" : config.project)]
+      [ config.user, config.project ]
     end
 
     def self.project_url user, project
-        "https://#{user}.unfuddle.com/a#/repositories/#{project}/browse"
+      "https://#{user}.unfuddle.com/a#/repositories/#{project}/browse"
     end
 
   end
-end
+end

data/lib/ciquantum/unfuddle/changeset.rb

@@ -0,0 +1,44 @@
+require 'active_support/core_ext'
+
+module CIQuantum
+  module Unfuddle
+    class ChangesetError < StandardError ; end
+
+    class Changeset
+      FIELDS = %w(repository_id revision message committer_name committer_date).freeze
+
+      attr_reader :author
+      attr_reader :message
+      attr_reader :date
+      attr_reader :commit
+      attr_reader :repo
+      attr_reader :xml
+
+      def initialize(xml)
+        xml = xml.to_s.strip
+        raise ChangesetError, 'Changeset XML required!' if xml.empty?
+
+        begin
+          @data = Hash.from_xml(xml)
+        rescue REXML::ParseException
+          raise ChangesetError, 'Invalid XML data!'
+        end
+
+        raise ChangesetError, 'Invalid changeset!' unless @data.key?('changeset')
+
+        @xml  = xml
+        @data = @data['changeset']
+
+        unless (FIELDS & @data.keys).size == FIELDS.size
+          raise ChangesetError, 'Invalid changeset!'
+        end
+
+        @commit  = @data['revision']
+        @author  = @data['committer_name']
+        @message = @data['message']
+        @date    = @data['committer_date']
+        @repo    = @data['repository_id']
+      end
+    end
+  end
+end

data/lib/ciquantum/version.rb

@@ -1,3 +1,3 @@
-class CIQuantum
-  Version = VERSION = "0.0.3"
+module CIQuantum
+  Version = VERSION = "0.0.6"
 end

data/lib/ciquantum/views/template.erb

@@ -2,7 +2,6 @@
 <html>
   <head>
     <link href="<%= ciquantum_root %>/screen.css" media="screen" rel="stylesheet" type="text/css" />
-    <link rel="shortcut icon" href="<%= ciquantum_root %>/favicon.ico" type="image/x-icon" />
     <title><%= h(quantum.projectname) %>: CI Quantum</title>
   </head>
   <body>
@@ -26,16 +25,22 @@
             </li>
           <% else %>
             <li>
-              <form method="POST">
-                <input type="hidden", name="rebuild" value="true">
+              <form method="POST" action="/build">
+                <span class="branch">Current branch: <%= quantum.git_branch %></span>  
+                <input type="submit" name="switch" value="Build"/>
+              </form>
+            </li>
+            <li>
+              <% if can_change_branch %>
+              <form method="POST" action="/switch_branch">
                 <select name="branch">
                   <% for @branch in quantum.git_branches %>
                     <option value="<%= @branch %>" <%= "selected=\"selected\"" if (@branch == quantum.git_branch) %> >"<%= @branch %>"</option>
                   <% end %>
                 </select>
-                <input type="submit" name="switch" value="Build once"/>
-                <input type="submit" name="switch" value="Switch branch"/>
+                <input type="submit" name="switch" value="Switch branch and build"/>
               </form>
+              <% end %>
             </li>
           <% end %>
           
@@ -61,30 +66,6 @@
           <% end %>
         </ul>
       </div>
-
-      <div class="footer">
-        <div class="contact">
-          <p>
-            <a href="https://github.com/meredian/ciquantum#readme">Documentation</a><br/>
-            <a href="https://github.com/meredian/ciquantum">Source</a><br/>
-            <a href="https://github.com/meredian/ciquantum/issues">Issues</a><br/>
-            <a href="https://github.com/meredian/ciquantum/tree/v<%= CIQuantum::VERSION %>">v<%= CIQuantum::VERSION %></a>
-          </p>
-        </div>
-        <div class="contact">
-          <p>
-            Designed by <a href="http://tom.preston-werner.com/">Tom Preston-Werner</a><br/>
-            Influenced by <a href="http://integrityapp.com/">Integrity</a><br/>
-            Built with <a href="http://sinatrarb.com/">Sinatra</a><br/>
-            Keep it simple, Sam.
-          </p>
-        </div>        
-        <div class="rss">
-          <a href="http://github.com/meredian/ciquantum">
-            <img src="<%= ciquantum_root %>/octocat.png" alt="Octocat!" />
-          </a>
-        </div>
-      </div>
     </div>
   </body>
 </html>

data/sample.rb

@@ -0,0 +1,15 @@
+require 'sinatra'
+require 'sq_auth'
+
+class Server < Sinatra::Base
+    enable :sessions
+    set :port, 5555
+
+    SqAuth.connect(host: "sqauth.socialquantum.com", port: 443) do |config|
+      config.project_name = "Enchanted"
+    end
+
+    get ["ci::view"], '/?' do
+      "Hello world. Authorize_info: #{access_for("ci::view"){"You can see it"}}"
+    end
+end

data/test/test_hooks.rb

@@ -18,19 +18,21 @@ class File
 end
 
 # #mock file to be the file I want
-class CIQuantum
-  attr_writer :last_build
-  alias orig_path_in_project path_in_project
-  alias orig_git_user_and_project git_user_and_project
+module CIQuantum
+  class Core
+    attr_writer :last_build
+    alias orig_path_in_project path_in_project
+    alias orig_git_user_and_project git_user_and_project
 
-  def path_in_project(f)
-    return '/tmp/test' if $hook_override
-    orig_path_in_project
-  end
+    def path_in_project(f)
+      return '/tmp/test' if $hook_override
+      orig_path_in_project
+    end
 
-  def git_user_and_project
-    return ['mine','yours'] if $hook_override
-    orig_git_user_and_project
+    def git_user_and_project
+      return ['mine','yours'] if $hook_override
+      orig_git_user_and_project
+    end
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ciquantum
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-23 00:00:00.000000000 Z
+date: 2012-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -109,6 +109,38 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pony
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sq_auth
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.21
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.21
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
@@ -158,22 +190,22 @@ files:
 - ciquantum.gemspec
 - examples/build-failed
 - examples/build-worked
-- examples/cijoe.ru
-- examples/cijoed
+- examples/ciquantum.ru
+- examples/ciquantumd
 - lib/ciquantum.rb
-- lib/ciquantum/adapter.rb
 - lib/ciquantum/build.rb
 - lib/ciquantum/commit.rb
 - lib/ciquantum/config.rb
-- lib/ciquantum/public/favicon.ico
-- lib/ciquantum/public/octocat.png
+- lib/ciquantum/core.rb
 - lib/ciquantum/public/screen.css
 - lib/ciquantum/queue.rb
 - lib/ciquantum/server.rb
-- lib/ciquantum/unfuddle_adapter.rb
+- lib/ciquantum/unfuddle.rb
+- lib/ciquantum/unfuddle/changeset.rb
 - lib/ciquantum/version.rb
 - lib/ciquantum/views/json.erb
 - lib/ciquantum/views/template.erb
+- sample.rb
 - test/fixtures/payload.json
 - test/helper.rb
 - test/test_ciquantum_queue.rb

data/lib/ciquantum/adapter.rb

@@ -1,15 +0,0 @@
-require 'ciquantum/unfuddle_adapter'
-
-class CIQuantum
-  class Adapter
-      class << self
-
-      attr_writer :default_adapter
-
-      def default_adapter
-        @default_adapter ||= CIQuantum::UnfuddleAdapter
-      end
-
-    end
-  end
-end