Merge branch 'remove_public_key_from_runner' into 'master'

Remove public key from runner

Author: dzaporozhets

app/models/build.rb

@@ -8,8 +8,8 @@
 #  status      :string(255)
 #  finished_at :datetime
 #  trace       :text
-#  created_at  :datetime         not null
-#  updated_at  :datetime         not null
+#  created_at  :datetime
+#  updated_at  :datetime
 #  sha         :string(255)
 #  started_at  :datetime
 #  tmp_file    :string(255)

app/models/project.rb

@@ -2,23 +2,23 @@
 #
 # Table name: projects
 #
-#  id                      :integer          not null, primary key
-#  name                    :string(255)      not null
-#  timeout                 :integer          default(1800), not null
-#  scripts                 :text             not null
-#  created_at              :datetime         not null
-#  updated_at              :datetime         not null
-#  token                   :string(255)
-#  default_ref             :string(255)
-#  gitlab_url              :string(255)
-#  always_build            :boolean          default(FALSE), not null
-#  polling_interval        :integer
-#  public                  :boolean          default(FALSE), not null
-#  ssh_url_to_repo         :string(255)
-#  gitlab_id               :integer
-#  allow_git_fetch         :boolean          default(TRUE), not null
-#  email_recipients        :string(255)      default(""), not null
-#  email_add_committer     :boolean          default(TRUE), not null
+#  id                       :integer          not null, primary key
+#  name                     :string(255)      not null
+#  timeout                  :integer          default(1800), not null
+#  scripts                  :text             not null
+#  created_at               :datetime
+#  updated_at               :datetime
+#  token                    :string(255)
+#  default_ref              :string(255)
+#  gitlab_url               :string(255)
+#  always_build             :boolean          default(FALSE), not null
+#  polling_interval         :integer
+#  public                   :boolean          default(FALSE), not null
+#  ssh_url_to_repo          :string(255)
+#  gitlab_id                :integer
+#  allow_git_fetch          :boolean          default(TRUE), not null
+#  email_recipients         :string(255)      default(""), not null
+#  email_add_committer      :boolean          default(TRUE), not null
 #  email_only_broken_builds :boolean          default(TRUE), not null
 #
 

app/models/runner.rb

@@ -4,9 +4,8 @@
 #
 #  id          :integer          not null, primary key
 #  token       :string(255)
-#  public_key  :text
-#  created_at  :datetime         not null
-#  updated_at  :datetime         not null
+#  created_at  :datetime
+#  updated_at  :datetime
 #  description :string(255)
 #
 
@@ -17,7 +16,7 @@ class Runner < ActiveRecord::Base
 
   has_one :last_build, ->() { order('id DESC') }, class_name: 'Build'
 
-  attr_accessible :token, :public_key, :description
+  attr_accessible :token, :description
 
   before_validation :set_default_values
 

app/models/runner_project.rb

@@ -5,8 +5,8 @@
 #  id         :integer          not null, primary key
 #  runner_id  :integer          not null
 #  project_id :integer          not null
-#  created_at :datetime         not null
-#  updated_at :datetime         not null
+#  created_at :datetime
+#  updated_at :datetime
 #
 
 class RunnerProject < ActiveRecord::Base

app/models/web_hook.rb

@@ -1,3 +1,14 @@
+# == Schema Information
+#
+# Table name: web_hooks
+#
+#  id         :integer          not null, primary key
+#  url        :string(255)      not null
+#  project_id :integer          not null
+#  created_at :datetime
+#  updated_at :datetime
+#
+
 class WebHook < ActiveRecord::Base
   include HTTParty
 

config/application.yml.example.development

@@ -5,3 +5,10 @@ development:
     host: localhost
     port: 9000
     https: false
+test:
+  gitlab_server_urls:
+    - 'http://demo.gitlab.com/'
+  gitlab_ci:
+    host: localhost
+    port: 80
+    https: false

db/migrate/20140506091853_remove_public_key_from_runner.rb

@@ -0,0 +1,5 @@
+class RemovePublicKeyFromRunner < ActiveRecord::Migration
+  def change
+    remove_column :runners, :public_key
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20140222210357) do
+ActiveRecord::Schema.define(version: 20140506091853) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -67,7 +67,6 @@
 
   create_table "runners", force: true do |t|
     t.string   "token"
-    t.text     "public_key"
     t.datetime "created_at"
     t.datetime "updated_at"
     t.string   "description"

lib/api/runners.rb

@@ -24,15 +24,14 @@ class Runners < Grape::API
       #
       # Parameters:
       #   token (required) - The unique token of runner
-      #   public_key (required) - Deploy key used to get projects
       #
       # Example Request:
       #   POST /runners/register
       post "register" do
         authenticate_runners!
-        required_attributes! [:token, :public_key]
+        required_attributes! [:token]
 
-        runner = Runner.create(public_key: params[:public_key])
+        runner = Runner.create
 
         if runner.id
           present runner, with: Entities::Runner

spec/factories/builds.rb

@@ -8,8 +8,8 @@
 #  status      :string(255)
 #  finished_at :datetime
 #  trace       :text
-#  created_at  :datetime         not null
-#  updated_at  :datetime         not null
+#  created_at  :datetime
+#  updated_at  :datetime
 #  sha         :string(255)
 #  started_at  :datetime
 #  tmp_file    :string(255)