pact_broker 2.0.0.beta.1 → 2.0.0.beta.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1868b3d1f43fe2ebee71e30e38088b70faa46c4
-  data.tar.gz: 6e0947382d1b455892c94b23b41b400ca2c8c7a6
+  metadata.gz: a57e6677da73f5beaa4ffaac55c4b2e277a870e6
+  data.tar.gz: 9a5f2f22da55e9288cde253de48851fcf87164a1
 SHA512:
-  metadata.gz: 0d592dfd992c8de6271f6bfbc30292bd48aa772d2eb914f741882efe853b5677ff8d440ffd41fa30686074dfab7116e1a082dcd87c11870a13adb162cef08161
-  data.tar.gz: 9dfc13a55c1ea8a00ef5efeed880a81687460030d20ea32c95e639076d70fba98d5c76d6e4b1c90da6eea2fea4ad7c90236a4ba27243f8fbba253b7d9ec6fc81
+  metadata.gz: 2e7a0e9ff2e827a051815fb140ef576e8cf8eb194109ac9a5129bb925812be9a917f380860a0c9c609c7caead91c33e409d3212eb6fa3137f5ab4b9a639e9b32
+  data.tar.gz: 6e8afbb69538b75be3c972629fffc702e68a910ea1dc6bef59e1fef82c6c8a378dfc3582a01c1cad71cfd82516ebae061a7a0ea958f27cfb14e81dc80a1c23df

data/CHANGELOG.md

@@ -2,8 +2,10 @@ Do this to generate your change history
 
     $ git log --pretty=format:'  * %h - %s (%an, %ad)' vX.Y.Z..HEAD
 
-#### 2.0.0.beta.1 (2017-04-28)
+#### 2.0.0.beta.2 (2017-04-29)
+* 1dfef17 - Cleaned up migrations and ensured migrations run on postgresql. (Beth Skurrie, Fri Apr 28 21:24:20 2017 +1000)
 
+#### 2.0.0.beta.1 (2017-04-28)
 * 049bc5c - Added tooltip to verification date to show provider version. (Beth Skurrie, Fri Apr 28 10:05:13 2017 +1000)
 * 4287c99 - Add tooltip text to last verified date when pact has changed since last verification. (Beth Skurrie, Fri Apr 28 09:02:59 2017 +1000)
 * 7351ec8 - Add restrictions for all gem versions in gemspec. Fix formatting in haml file. (Beth Skurrie, Thu Apr 27 19:55:04 2017 +1000)

data/config/database.yml

@@ -6,6 +6,13 @@ test:
   <<: *default
   database: tmp/pact_broker_database_test.sqlite3
 
+# test:
+#   adapter: "postgres"
+#   database: "pact_broker"
+#   username: 'pact_broker'
+#   password: 'pact_broker'
+#   encoding: 'utf8'
+
 development:
   <<: *default
 

data/db/migrations/{23_create_pact_contents_table.rb → 23_create_pact_versions_table.rb}

@@ -2,7 +2,7 @@ require_relative 'migration_helper'
 
 Sequel.migration do
   up do
-    create_table(:pact_contents, charset: 'utf8') do
+    create_table(:pact_versions, charset: 'utf8') do
       primary_key :id
       foreign_key :consumer_id, :pacticipants
       foreign_key :provider_id, :pacticipants
@@ -14,6 +14,6 @@ Sequel.migration do
   end
 
   down do
-    drop_table(:pact_contents)
+
   end
 end

data/db/migrations/24_populate_pact_versions.rb

@@ -0,0 +1,8 @@
+Sequel.migration do
+  up do
+    run("insert into pact_versions (sha, content, created_at) select sha, content, created_at from pact_version_contents")
+    run("update pact_versions set consumer_id = (select consumer_id from all_pacts where pact_version_content_sha = pact_versions.sha limit 1)")
+    run("update pact_versions set provider_id = (select provider_id from all_pacts where pact_version_content_sha = pact_versions.sha limit 1)")
+    run("delete from pact_versions where consumer_id is null")
+  end
+end

data/db/migrations/{26_make_pc_pacticipants_mandatory.rb → 25_make_pv_pacticipants_mandatory.rb}

@@ -1,6 +1,6 @@
 Sequel.migration do
   up do
-    alter_table(:pact_contents) do
+    alter_table(:pact_versions) do
       set_column_not_null(:consumer_id)
       set_column_not_null(:provider_id)
     end

data/db/migrations/{27_create_pact_publications.rb → 26_create_pact_publications.rb}

@@ -5,14 +5,10 @@ Sequel.migration do
       foreign_key :consumer_version_id, :versions, null: false
       foreign_key :provider_id, :pacticipants, null: false
       Integer :revision_number, null: false
-      foreign_key :pact_version_id, :pact_contents, null: false
+      foreign_key :pact_version_id, :pact_versions, null: false
       DateTime :created_at, null: false
       index [:consumer_version_id, :provider_id, :revision_number], unique: true, name: 'cv_prov_revision_unq'
       index [:consumer_version_id, :provider_id, :id], name: 'cv_prov_id_ndx'
     end
   end
-
-  down do
-    drop_table(:pact_publications)
-  end
 end

data/db/migrations/27_populate_pact_publications.rb

@@ -0,0 +1,12 @@
+Sequel.migration do
+  up do
+    run("insert into pact_publications
+        (id, consumer_version_id, provider_id, revision_number, pact_version_id, created_at)
+      select ap.id, ap.consumer_version_id, ap.provider_id, 1, pc.id, ap.updated_at
+      from all_pacts ap inner join pact_versions pc
+      on pc.sha = ap.pact_version_content_sha")
+  end
+
+  down do
+  end
+end

data/db/migrations/28_populate_pact_publications.rb

@@ -1,13 +1,8 @@
 Sequel.migration do
   up do
-    run("insert into pact_publications
-        (id, consumer_version_id, provider_id, revision_number, pact_version_id, created_at)
-      select ap.id, ap.consumer_version_id, ap.provider_id, 1, pc.id, ap.updated_at
-      from all_pacts ap inner join pact_contents pc
-      on pc.sha = ap.pact_version_content_sha")
+
   end
 
   down do
-    run("delete from pact_publications")
   end
 end

data/db/migrations/{33_recreate_all_pacts.rb → 29_create_all_pact_publications.rb}

@@ -1,7 +1,7 @@
 Sequel.migration do
   up do
     # The denormalised pact publication details for each publication
-    create_or_replace_view(:all_pact_publications,
+    create_view(:all_pact_publications,
       Sequel::Model.db[:pact_publications].select(:pact_publications__id,
       :c__id___consumer_id, :c__name___consumer_name,
       :cv__id___consumer_version_id, :cv__number___consumer_version_number, :cv__order___consumer_version_order,
@@ -14,14 +14,14 @@ Sequel.migration do
     )
 
     # Latest revision number for each consumer version order
-    create_or_replace_view(:latest_pact_publication_revision_numbers,
+    create_view(:latest_pact_publication_revision_numbers,
       "select provider_id, consumer_id, consumer_version_order, max(revision_number) as latest_revision_number
       from all_pact_publications
       group by provider_id, consumer_id, consumer_version_order"
     )
 
     # Latest pact_publication details for each consumer version
-    create_or_replace_view(:latest_pact_publications_by_consumer_versions,
+    create_view(:latest_pact_publications_by_consumer_versions,
       "select app.*
       from all_pact_publications app
       inner join latest_pact_publication_revision_numbers lr
@@ -39,7 +39,7 @@ Sequel.migration do
     )
 
     # Latest pact publications by consumer/provider
-    create_or_replace_view(:latest_pact_publications,
+    create_view(:latest_pact_publications,
       "select lpcv.*
       from latest_pact_publications_by_consumer_versions lpcv
       inner join latest_pact_consumer_version_orders lp

data/db/migrations/{34_recreate_latest_tagged_pacts.rb → 30_create_latest_tagged_pact_publications.rb}

@@ -8,7 +8,7 @@ Sequel.migration do
       group by provider_id, consumer_id, t.name"
     )
 
-    create_or_replace_view(:latest_tagged_pact_publications,
+    create_view(:latest_tagged_pact_publications,
       "select lp.*, o.tag_name
       from latest_pact_publications_by_consumer_versions lp
       inner join latest_tagged_pact_consumer_version_orders o
@@ -16,8 +16,5 @@ Sequel.migration do
         and lp.provider_id = o.provider_id
         and lp.consumer_version_order = latest_consumer_version_order"
     )
-
-    drop_view(:all_pacts)
-    drop_view(:latest_pacts)
   end
 end

data/db/migrations/31_drop_old_tables_and_views.rb

@@ -0,0 +1,9 @@
+Sequel.migration do
+  up do
+    drop_view(:latest_tagged_pacts)
+    drop_view(:latest_pacts)
+    drop_view(:all_pacts)
+    drop_table(:pacts)
+    drop_table(:pact_version_contents)
+  end
+end

data/lib/pact_broker/pacts/repository.rb

@@ -59,9 +59,9 @@ module PactBroker
 
       def find_latest_pact_versions_for_provider provider_name, tag = nil
         if tag
-          LatestTaggedPactPublications.provider(provider_name).where(tag_name: tag).collect(&:to_domain)
+          LatestTaggedPactPublications.provider(provider_name).where(tag_name: tag).order(:consumer_name).collect(&:to_domain)
         else
-          LatestPactPublications.provider(provider_name).collect(&:to_domain)
+          LatestPactPublications.provider(provider_name).order(:consumer_name).collect(&:to_domain)
         end
       end
 
@@ -73,7 +73,7 @@ module PactBroker
       end
 
       def find_latest_pacts
-        LatestPactPublications.collect(&:to_domain_without_tags)
+        LatestPactPublications.order(:consumer_name, :provider_name).collect(&:to_domain_without_tags)
       end
 
       def find_latest_pact(consumer_name, provider_name, tag = nil)

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = '2.0.0.beta.1'
+  VERSION = '2.0.0.beta.2'
 end

data/pact_broker.gemspec

@@ -45,4 +45,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rspec', '~>3.0'
   gem.add_development_dependency 'rspec-its'
   gem.add_development_dependency 'database_cleaner'
+  gem.add_development_dependency 'pg'
 end

data/spec/lib/pact_broker/api/decorators/verifications_decorator_spec.rb

@@ -10,7 +10,6 @@ module PactBroker
             success: true, number: 1,
             provider_version: '4.5.6',
             build_url: 'http://some-build',
-            latest_pact_publication: pact,
             provider_name: 'provider',
             consumer_name: 'consumer',
             pact_version: pact_version,

data/spec/lib/pact_broker/verifications/service_spec.rb

@@ -41,7 +41,7 @@ module PactBroker
         it "sets the pact content for the verification" do
           verification = create_verification
           expect(verification.pact_version_id).to_not be_nil
-          expect(verification.pact_version.id).to eq pact.id
+          expect(verification.pact_version).to_not be_nil
         end
       end
 

data/spec/lib/pact_broker/versions/repository_spec.rb

@@ -41,7 +41,7 @@ module PactBroker
           end
 
           it "returns the version" do
-            expect(subject.id).to eq 1
+            expect(subject.id).to_not be_nil
             expect(subject.number).to eq version_number
             expect(subject.pacticipant.name).to eq pacticipant_name
             expect(subject.tags.first.name).to eq "prod"

data/spec/migrations/23_pact_versions_spec.rb

@@ -11,17 +11,10 @@ describe 'migrate to pact versions (migrate 22-31)', no_db_clean: :true do
     database[table_name].delete rescue puts "Error cleaning #{table_name} #{$!}"
   end
 
-  def new_connection
-    Sequel::DATABASES.clear
-    DB.connection_for_env 'test'
-  end
-
-  let(:database) { new_connection }
+  let(:database) { DB.connection_for_env 'test' }
 
   before do
-    PactBroker::Database.delete_database_file
-    PactBroker::Database.ensure_database_dir_exists
-    database = new_connection
+    PactBroker::Database.drop_objects
     PactBroker::Database.migrate(22)
   end
 
@@ -47,7 +40,6 @@ describe 'migrate to pact versions (migrate 22-31)', no_db_clean: :true do
 
   it "uses the old updated date for the new creation date" do
     do_migration
-    # expect(new_connection[:latest_pact_publications_by_consumer_versions].order(:id).first[:created_at]).to eq pact_updated_at
     expect(database[:latest_pact_publications_by_consumer_versions].order(:id).first[:created_at]).to eq pact_updated_at
   end
 
@@ -87,9 +79,7 @@ describe 'migrate to pact versions (migrate 22-31)', no_db_clean: :true do
   end
 
   after do
-    PactBroker::Database.delete_database_file
-    PactBroker::Database.ensure_database_dir_exists
-    database = new_connection
     PactBroker::Database.migrate
+    PactBroker::Database.truncate
   end
 end

data/spec/migrations/24_populate_pact_contents_spec.rb

@@ -7,16 +7,10 @@ describe 'migrate to pact versions (migrate 22-24)', no_db_clean: :true do
     database[table_name].order(id_column_name).last
   end
 
-  def new_connection
-    DB.connection_for_env 'test'
-  end
-
-  let(:database) { new_connection }
+  let(:database) { DB.connection_for_env 'test' }
 
   before do
-    PactBroker::Database.delete_database_file
-    PactBroker::Database.ensure_database_dir_exists
-    database = new_connection
+    PactBroker::Database.drop_objects
     PactBroker::Database.migrate(22)
   end
 
@@ -40,9 +34,7 @@ describe 'migrate to pact versions (migrate 22-24)', no_db_clean: :true do
   end
 
   after do
-    PactBroker::Database.delete_database_file
-    PactBroker::Database.ensure_database_dir_exists
-    database = new_connection
     PactBroker::Database.migrate
+    PactBroker::Database.truncate
   end
 end

data/spec/migrations/34_latest_tagged_pacts_spec.rb

@@ -7,16 +7,10 @@ describe 'using pact publications (migrate 31-32)', no_db_clean: :true do
     database[table_name].order(id_column_name).last
   end
 
-  def new_connection
-    DB.connection_for_env 'test'
-  end
-
-  let(:database) { new_connection }
+  let(:database) { DB.connection_for_env 'test' }
 
   before do
-    PactBroker::Database.delete_database_file
-    PactBroker::Database.ensure_database_dir_exists
-    database = new_connection
+    PactBroker::Database.drop_objects
     PactBroker::Database.migrate(34)
   end
 
@@ -100,9 +94,7 @@ describe 'using pact publications (migrate 31-32)', no_db_clean: :true do
   end
 
   after do
-    PactBroker::Database.delete_database_file
-    PactBroker::Database.ensure_database_dir_exists
-    database = new_connection
     PactBroker::Database.migrate
+    PactBroker::Database.truncate
   end
 end

data/spec/migrations/34_pact_revisions_spec.rb

@@ -7,16 +7,10 @@ describe 'using pact publications (migrate 31-32)', no_db_clean: :true do
     database[table_name].order(id_column_name).last
   end
 
-  def new_connection
-    DB.connection_for_env 'test'
-  end
-
-  let(:database) { new_connection }
+  let(:database) { DB.connection_for_env 'test' }
 
   before do
-    PactBroker::Database.delete_database_file
-    PactBroker::Database.ensure_database_dir_exists
-    database = new_connection
+    PactBroker::Database.drop_objects
     PactBroker::Database.migrate(33)
   end
 
@@ -98,9 +92,7 @@ describe 'using pact publications (migrate 31-32)', no_db_clean: :true do
   end
 
   after do
-    PactBroker::Database.delete_database_file
-    PactBroker::Database.ensure_database_dir_exists
-    database = new_connection
     PactBroker::Database.migrate
+    PactBroker::Database.truncate
   end
 end

data/tasks/database.rb

@@ -1,5 +1,6 @@
 require 'pact_broker/project_root'
 require 'sequel'
+require 'yaml'
 require 'db'
 
 Sequel.extension :migration
@@ -7,6 +8,8 @@ Sequel.extension :migration
 module PactBroker
   module Database
 
+    TABLES = [:pacts, :pact_version_contents, :tags, :verifications, :pact_publications, :pact_versions,  :webhook_headers, :webhooks, :versions, :pacticipants].freeze
+
     extend self
 
     def migrate target = nil
@@ -32,14 +35,77 @@ module PactBroker
       FileUtils.mkdir_p File.dirname(database_file_path)
     end
 
+    def drop_objects
+      drop_views
+      drop_tables
+    end
+
+    def drop_tables
+      (TABLES + [:schema_info]).each do | table_name |
+        if database.table_exists?(table_name)
+          database.drop_table(table_name, cascade: psql?)
+        end
+      end
+    end
+
+    def drop_views
+      database.views.each do | view_name |
+        begin
+          # checking for existance using table_exists? doesn't work in sqlite
+          database.drop_view(view_name, cascade: psql?)
+        rescue Sequel::DatabaseError => e
+          # Cascade will have deleted some views already with pg
+          raise e unless e.cause.class.name == 'PG::UndefinedTable'
+        end
+      end
+    end
+
+    def create
+      puts adapter
+      if psql?
+        system('psql postgres -c "create database pact_broker"')
+        system('psql postgres -c "CREATE USER pact_broker WITH PASSWORD \'pact_broker\'"')
+        system('psql postgres -c "GRANT ALL PRIVILEGES ON DATABASE pact_broker to pact_broker"')
+      elsif sqlite?
+        ensure_database_dir_exists
+      else
+        raise "Unknown database adapter #{adapter}"
+      end
+    end
+
+    def recreate
+      drop_tables
+      create
+    end
+
+    def truncate
+      TABLES.each do | table_name |
+        if database.table_exists?(table_name)
+          database[table_name].delete
+        end
+      end
+    end
+
+    def database= database
+      @@database = database
+    end
+
+    def database
+      @@database ||= ::DB.connection_for_env env
+    end
+
     private
 
     def ensure_not_production
       raise "Cannot delete production database using this task" if env == 'production'
     end
 
-    def database
-      ::DB.connection_for_env env
+    def psql?
+      adapter == 'postgres'
+    end
+
+    def sqlite?
+      adapter == 'sqlite'
     end
 
     def migrations_dir
@@ -47,7 +113,17 @@ module PactBroker
     end
 
     def database_file_path
-      ::DB.configuration_for_env(env)['database']
+      configuration_for_env(env)['database']
+    end
+
+    def adapter
+      configuration_for_env(env)['adapter']
+    end
+
+    def configuration_for_env env
+      database_yml = PactBroker.project_root.join('config','database.yml')
+      config = YAML.load(ERB.new(File.read(database_yml)).result)
+      config.fetch(env)
     end
 
     def env

data/tasks/db.rake

@@ -52,6 +52,10 @@ namespace :db do
     PactBroker::Database.ensure_database_dir_exists
   end
 
+  task :create => 'db:env' do
+    PactBroker::Database.create
+  end
+
   # Private
   task :set_test_env do
     ENV['RACK_ENV'] = 'test'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta.1
+  version: 2.0.0.beta.2
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -346,6 +346,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A server that stores and returns pact files generated by the pact gem.
   It enables head/prod cross testing of the consumer and provider projects.
 email:
@@ -393,20 +407,17 @@ files:
 - db/migrations/20_add_pact_version_content_sha_to_all_pacts_view.rb
 - db/migrations/21_recreate_latest_pacts_view.rb
 - db/migrations/22_create_latest_tagged_pacts_view.rb
-- db/migrations/23_create_pact_contents_table.rb
-- db/migrations/24_populate_pact_contents.rb
-- db/migrations/25_populate_pact_contents_pacticipants.rb
-- db/migrations/26_make_pc_pacticipants_mandatory.rb
-- db/migrations/27_create_pact_publications.rb
+- db/migrations/23_create_pact_versions_table.rb
+- db/migrations/24_populate_pact_versions.rb
+- db/migrations/25_make_pv_pacticipants_mandatory.rb
+- db/migrations/26_create_pact_publications.rb
+- db/migrations/27_populate_pact_publications.rb
 - db/migrations/28_populate_pact_publications.rb
-- db/migrations/29_recreate_all_pacts.rb
-- db/migrations/30_drop_pacts.rb
-- db/migrations/31_drop_pact_version_contents.rb
-- db/migrations/32_rename_pact_contents.rb
-- db/migrations/33_recreate_all_pacts.rb
-- db/migrations/34_recreate_latest_tagged_pacts.rb
-- db/migrations/35_create_verifications.rb
-- db/migrations/36_create_latest_verifications.rb
+- db/migrations/29_create_all_pact_publications.rb
+- db/migrations/30_create_latest_tagged_pact_publications.rb
+- db/migrations/31_drop_old_tables_and_views.rb
+- db/migrations/32_create_verifications.rb
+- db/migrations/33_create_latest_verifications.rb
 - db/migrations/migration_helper.rb
 - db/pact_broker_database.sqlite3
 - example/Gemfile

data/db/migrations/24_populate_pact_contents.rb

@@ -1,9 +0,0 @@
-Sequel.migration do
-  up do
-    run("insert into pact_contents (sha, content, created_at) select sha, content, created_at from pact_version_contents")
-  end
-
-  down do
-    run("delete from pact_contents")
-  end
-end

data/db/migrations/25_populate_pact_contents_pacticipants.rb

@@ -1,7 +0,0 @@
-Sequel.migration do
-  up do
-    run("update pact_contents set consumer_id = (select consumer_id from all_pacts where pact_version_content_sha = pact_contents.sha limit 1)")
-    run("update pact_contents set provider_id = (select provider_id from all_pacts where pact_version_content_sha = pact_contents.sha limit 1)")
-    run("delete from pact_contents where consumer_id is null")
-  end
-end

data/db/migrations/29_recreate_all_pacts.rb

@@ -1,16 +0,0 @@
-Sequel.migration do
-  up do
-    create_or_replace_view(:all_pacts,
-      Sequel::Model.db[:pact_publications].select(:pact_publications__id,
-      :c__id___consumer_id, :c__name___consumer_name,
-      :cv__id___consumer_version_id, :cv__number___consumer_version_number, :cv__order___consumer_version_order,
-      :p__id___provider_id, :p__name___provider_name,
-      :pact_publications__revision_number, :pc__sha___pact_version_sha, :pact_publications__created_at).
-      join(:versions, {:id => :consumer_version_id}, {:table_alias => :cv, implicit_qualifier: :pact_publications}).
-      join(:pacticipants, {:id => :pacticipant_id}, {:table_alias => :c, implicit_qualifier: :cv}).
-      join(:pacticipants, {:id => :provider_id}, {:table_alias => :p, implicit_qualifier: :pact_publications}).
-      join(:pact_contents, {:id => :pact_version_id}, {:table_alias => :pc, implicit_qualifier: :pact_publications})
-    )
-  end
-end
-

data/db/migrations/30_drop_pacts.rb

@@ -1,8 +0,0 @@
-require 'digest/sha1'
-require_relative 'migration_helper'
-
-Sequel.migration do
-  up do
-    drop_table(:pacts)
-  end
-end

data/db/migrations/31_drop_pact_version_contents.rb

@@ -1,5 +0,0 @@
-Sequel.migration do
-  up do
-    drop_table(:pact_version_contents)
-  end
-end

data/db/migrations/32_rename_pact_contents.rb

@@ -1,5 +0,0 @@
-Sequel.migration do
-  up do
-    rename_table(:pact_contents, :pact_versions)
-  end
-end