ciquantum 0.0.17 → 0.0.18

data/lib/ciquantum.rb

@@ -1,8 +1,7 @@
 
 require 'ciquantum/version'
 require 'ciquantum/config'
-require 'ciquantum/unfuddle'
-require 'ciquantum/unfuddle/changeset'
+require 'ciquantum/adapter'
 require 'ciquantum/utils/mailer'
 require 'ciquantum/utils/coverage_merger'
 require 'ciquantum/git'

data/lib/ciquantum/adapter.rb

@@ -0,0 +1,17 @@
+
+Dir[File.join(File.dirname(__FILE__), "adapter/**/*.rb")].each {|f| require f}
+
+module CIQuantum
+  module Adapter
+    class << self
+
+      def from_config config
+        name = config.adapter.to_s
+        puts config.config_string
+        puts "Config: #{config}; Name: #{name}"
+        const_get(name).from_config(config) unless name.empty?
+      end
+
+    end
+  end
+end

data/lib/ciquantum/adapter/gitlab.rb

@@ -0,0 +1,32 @@
+module CIQuantum
+  module Adapter
+    class Gitlab < Struct.new(:config)
+
+      def self.config_name
+        'gitlab'
+      end
+
+      def self.from_config config
+        self.new config[config_name]
+      end
+
+      def commit_url commit
+        "https://gitlab.sqtools.ru:11443/#{config.project}/commits/#{commit.sha}"
+      end
+
+      def url
+        "https://gitlab.sqtools.ru:11443/#{config.project}"
+      end
+
+      def [] command
+        return config[command]
+      end
+
+      def commit_from_request request
+        hash = JSON.parse request.body.read.strip
+        return (hash["repository"]["name"] == config.project) ? hash["after"] : nil
+      end
+
+    end
+  end
+end

data/lib/ciquantum/adapter/unfuddle.rb

@@ -0,0 +1,37 @@
+
+module CIQuantum
+  module Adapter
+    class Unfuddle < Struct.new(:config)
+
+      def self.config_name
+        'unfuddle'
+      end
+
+      def self.from_config config
+        self.new config[config_name]
+      end
+
+      def commit_url commit
+        "http://#{config.user}.unfuddle.com/a#/repositories/#{config.project}/commit?commit=#{commit.sha}"
+      end
+
+      def url
+        "https://#{config.user}.unfuddle.com/a#/repositories/#{config.project}/browse"
+      end
+
+      def [] command
+        return config[command]
+      end
+
+      def commit_from_request request
+        begin
+          xml = request.body.read
+          return Changeset.new(xml).commit
+        rescue Unfuddle::ChangesetError => e
+          nil
+        end
+      end
+
+    end
+  end
+end

data/lib/ciquantum/adapter/unfuddle/changeset.rb

@@ -0,0 +1,46 @@
+require 'active_support/core_ext'
+
+module CIQuantum
+  module Adater
+    class 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
+end

data/lib/ciquantum/config.rb

@@ -30,6 +30,7 @@ module CIQuantum
       end
     end
 
+
     def config_string
       @parent ? "#{@parent.config_string}.#{@command}" : @command
     end

data/lib/ciquantum/core.rb

@@ -17,7 +17,7 @@ module CIQuantum
     def initialize(project_path)
       @is_building = false
       @project_path = File.expand_path(project_path)
-      @adapter = Unfuddle.from_config(repo_config)
+      @adapter = Adapter.from_config(repo_config)
 
       @projectname = repo_config.projectname.to_s
       @coverage_path = repo_config.coveragepath.to_s
@@ -225,7 +225,9 @@ module CIQuantum
     end
 
     def read_build(name)
-      Build.load(path_in_project(".git/builds/#{name}"), @project_path)
+      build = Build.load(path_in_project(".git/builds/#{name}"), @project_path)
+      build.commit.get_url! adapter if build && build.commit && adapter
+      build
     end
 
     def read_last_build

data/lib/ciquantum/server.rb

@@ -82,15 +82,10 @@ module CIQuantum
     end
 
     post '/push' do
-      begin
-        xml = request.body.read
-        changeset = Unfuddle::Changeset.new(xml)
-        if quantum.git.current_branch_contains_commit? changeset.commit
-          quantum.build
-        end
-      rescue Unfuddle::ChangesetError => e
-        logger.error "[error] Changeset error: #{e.inspect}, Content: #{xml.inspect}"
-        halt 400, "Changeset Error: #{e.message}"
+      puts "Request received on push:\n#{request.body.read}"
+      commit = quantum.adapter.commit_from_request request
+      if quantum.git.current_branch_contains_commit? commit
+        quantum.build
       end
     end
 

data/lib/ciquantum/version.rb

@@ -1,3 +1,3 @@
 module CIQuantum
-  Version = VERSION = "0.0.17"
+  Version = VERSION = "0.0.18"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ciquantum
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-22 00:00:00.000000000 Z
+date: 2012-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -193,6 +193,10 @@ files:
 - examples/ciquantum.ru
 - examples/ciquantumd
 - lib/ciquantum.rb
+- lib/ciquantum/adapter.rb
+- lib/ciquantum/adapter/gitlab.rb
+- lib/ciquantum/adapter/unfuddle.rb
+- lib/ciquantum/adapter/unfuddle/changeset.rb
 - lib/ciquantum/build.rb
 - lib/ciquantum/commit.rb
 - lib/ciquantum/config.rb
@@ -202,8 +206,6 @@ files:
 - lib/ciquantum/public/screen.css
 - lib/ciquantum/queue.rb
 - lib/ciquantum/server.rb
-- lib/ciquantum/unfuddle.rb
-- lib/ciquantum/unfuddle/changeset.rb
 - lib/ciquantum/utils/coverage_merger.rb
 - lib/ciquantum/utils/mailer.rb
 - lib/ciquantum/version.rb

data/lib/ciquantum/unfuddle.rb

@@ -1,25 +0,0 @@
-module CIQuantum
-  class Unfuddle < Struct.new(:config)
-
-    def self.config_name
-      'unfuddle'
-    end
-
-    def self.from_config config
-      self.new config[config_name]
-    end
-
-    def commit_url commit
-      "http://#{config.user}.unfuddle.com/a#/repositories/#{config.project}/commit?commit=#{commit.sha}"
-    end
-
-    def url
-      "https://#{config.user}.unfuddle.com/a#/repositories/#{config.project}/browse"
-    end
-
-    def [] command
-      return @config[command]
-    end
-
-  end
-end

data/lib/ciquantum/unfuddle/changeset.rb

@@ -1,44 +0,0 @@
-require 'active_support/core_ext'
-
-module CIQuantum
-  class 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