prodder 1.7.4 → 1.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d6ea348f3b248b5660b358f476eae0339608c3d0
-  data.tar.gz: dcb3d21cb200fdce2755505f221c115da3b3548c
+SHA256:
+  metadata.gz: 26e389eb90419a1ac54845075f953e58fd3b1035214854773ead1528c338707a
+  data.tar.gz: b57a008eca5e26de21fbbc47f25e7ffd582b6f5a0d5228e913154dbb502cfe5b
 SHA512:
-  metadata.gz: 381f5e5da69fa8513382656c1734fd8b3aeb4cf33114652e7d46382f42fb58aae9f8c6e302bce3a7cff9f0d98417bbcabd787dc3dff41754cd7866945d5e198b
-  data.tar.gz: 54c89d1d27dab947d1039c3347fae18c1e65641097163692fe5597360a940630d92bfefdf458c3f612d8cb371b655505b0348a7d2a236bc3611693d33e7384dc
+  metadata.gz: e856705e7bcdd77de90de067aa20093ada1e6da740bdb3643134de9b9c6a5e164776d7aa7c5f3f02b3bcf0f93bac526a56cda7ce0662d2beadb6410a896025ce
+  data.tar.gz: b36befbd98f1e3df3c7674f30fbc82f9ddd2766805c597e2f6340a3e0068dc6b72c54be7fc795f168bc3b3b67b9e4ae5742ed13c6f11a25d9a307084f21e9808

data/.gitignore

@@ -1,3 +1,4 @@
+Gemfile.lock
 *.gem
 *.rbc
 .bundle

data/.travis.yml

@@ -2,9 +2,9 @@ language: ruby
 cache: bundler
 
 rvm:
-  - 2.3.0
-  - 2.2.4
-  - 2.1.8
+  - 2.4.2
+  - 2.3.5
+  - 2.2.8
 
 env:
   matrix:
@@ -28,17 +28,10 @@ before_install:
   - psql -U postgres -d postgres -c 'select setting from pg_settings where name = $m$server_version$m$;'
 
 script:
-  - echo "===================================================="
-  - echo "PG_VERSION|$PG_VERSION|"
-  - echo "===================================================="
   - psql --version
-  - echo "===================================================="
   - pg_lsclusters
-  - echo "===================================================="
   - psql -U postgres -d postgres -c 'select 1;'
-  - echo "===================================================="
   - ls -al `which pg_dump`
-  - echo "===================================================="
   - bundle exec rake spec
   - bundle exec rake cucumber
 

data/Gemfile

@@ -10,7 +10,7 @@ group :development, :test do
   gem 'pry'
   gem 'pry-remote'
   gem 'rspec'
-  gem 'cucumber'
-  gem 'aruba'
+  gem 'cucumber', '< 3' # FIXME
+  gem 'aruba', '~> 0.5.0'
   gem 'pg'
 end

data/features/prodder.feature

@@ -2,7 +2,7 @@ Feature: Basic CLI usage
 
   Scenario: prodder help
     When I run `prodder help`
-    Then the output should contain "Tasks:"
+    Then the output should contain "Commands:"
 
   Scenario: No config file supplied
     When I run `prodder`

data/features/push.feature

@@ -16,7 +16,7 @@ Feature: prodder push
     Given the "blog" git repository does not allow pushing to it
     When I run `prodder push -c prodder.yml`
     Then the exit status should be 1
-    And the output should contain "insufficient permission"
+    And the output should contain "remote rejected"
 
   Scenario: Push fails due to non-fast-forward
     Given a new commit is already in the "blog" git repository

data/features/step_definitions/git_steps.rb

@@ -5,8 +5,10 @@ Given 'a "$project" git repository' do |project|
   end
 
   run_simple "mkdir -p repos"
-  run_simple "chmod -R a+w repos/#{project}.git" if File.exist? File.join(current_dir, "repos", "#{project}.git")
-  remove_dir "repos/#{project}.git"
+  if File.exist? File.join(current_dir, "repos", "#{project}.git")
+    run_simple "chmod -R a+w repos/#{project}.git"
+    run_simple "rm -rf repos/#{project}.git"
+  end
   run_simple "cp -pR #{fixture_repo} repos/#{project}.git"
 end
 
@@ -29,37 +31,37 @@ end
 Then(/^(\d+) commits? by "([^"]+)" should be in the "([^"]+)" repository$/) do |n, author, project|
   in_workspace(project) do
     authors = `git log --pretty='format:%an'`.split("\n")
-    authors.grep(/#{author}/).size.should == Integer(n)
+    expect(authors.grep(/#{author}/).size).to eq Integer(n)
   end
 end
 
 Then 'the file "$filename" should now be tracked' do |filename|
   in_current_dir do
     git = Prodder::Git.new(File.expand_path("prodder-workspace/blog"), nil)
-    git.should be_tracked(filename)
+    expect(git).to be_tracked(filename)
   end
 end
 
 Then 'the latest commit should have changed "$file" to contain "$content"' do |filename, content|
   in_workspace('blog') do
     changed = `git show --name-only HEAD | grep #{filename}`.split("\n")
-    changed.should_not be_empty
+    expect(changed).to_not be_empty
 
     diff = `git show HEAD | grep '#{content}'`.split("\n")
-    diff.should_not be_empty
+    expect(diff).to_not be_empty
   end
 end
 
 Then 'the latest commit should not have changed "$filename"' do |filename|
   in_workspace('blog') do
     changed = `git show --name-only HEAD | grep #{filename}`.split("\n")
-    changed.should be_empty
+    expect(changed).to be_empty
   end
 end
 
 Then 'the new commit should be in the remote repository' do
   in_current_dir do
     latest = `git --git-dir="./repos/blog.git" log | grep prodder`.split("\n")
-    latest.should_not be_empty
+    expect(latest).to_not be_empty
   end
 end

data/lib/prodder/project.rb

@@ -45,7 +45,9 @@ module Prodder
         contents = File.readlines(structure_file_name)
         rgx = /^\-\- .* Type: INDEX; |^\-\- .* Type: TRIGGER; |^\-\- .* Type: FK CONSTRAINT; /
         structure, *quality = contents.slice_before(rgx).to_a
-        quality_checks = structure.grep(/SET search_path/).last + quality.join
+        # the first search path setting for constraints gets left over
+        # in the structure, so we need to *attempt* to grab that
+        quality_checks = (structure.grep(/SET search_path/).last || '') + quality.join
 
         File.open(quality_check_file_name, 'w') { |f| f.write(quality_checks) }
         File.open(structure_file_name, 'w') { |f| f.write(structure.join) }

data/lib/prodder/version.rb

@@ -1,3 +1,3 @@
 module Prodder
-  VERSION = "1.7.4"
+  VERSION = "1.7.5"
 end

data/spec/config_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Prodder::Config, 'linting' do
+RSpec.describe Prodder::Config, 'linting' do
   let(:valid_config) { YAML.load Prodder::Config.example_contents }
 
   def config_without(path)
@@ -21,7 +21,6 @@ describe Prodder::Config, 'linting' do
   end
 
   context 'missing required key:' do
-
     %w[structure_file
        seed_file
 
@@ -35,15 +34,14 @@ describe Prodder::Config, 'linting' do
        git/author
     ].each do |path|
       specify path do
-        errors_for(config_without "blog/#{path}").should ==
-          ["Missing required configuration key: blog/#{path}"]
+        expect(errors_for(config_without "blog/#{path}")).to eq ["Missing required configuration key: blog/#{path}"]
       end
     end
   end
 
   context 'optional keys:' do
     specify 'db/password' do
-      errors_for(config_without 'blog/db/password').should be_empty
+      expect(errors_for(config_without 'blog/db/password')).to be_empty
     end
   end
 
@@ -53,12 +51,12 @@ describe Prodder::Config, 'linting' do
       expect {
         config.lint!
       }.to raise_error(Prodder::Config::LintError) { |ex|
-        ex.errors.should == ['Missing required configuration key: blog/db/name']
+        expect(ex.errors).to eq ['Missing required configuration key: blog/db/name']
       }
     end
 
     it 'returns an empty collection if there are no errors' do
-      Prodder::Config.new(valid_config).lint!.should == []
+      expect(Prodder::Config.new(valid_config).lint!).to eq []
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,3 +1,7 @@
 require 'rspec'
 require 'pry'
 require 'prodder'
+
+RSpec.configure do |config|
+  config.disable_monkey_patching!
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prodder
 version: !ruby/object:Gem::Version
-  version: 1.7.4
+  version: 1.7.5
 platform: ruby
 authors:
 - Kyle Hargraves
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-29 00:00:00.000000000 Z
+date: 2018-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deject
@@ -35,7 +35,6 @@ files:
 - ".gitignore"
 - ".travis.yml"
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -83,7 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Maintain your Rails apps' structure, seed and quality_checks files using

data/Gemfile.lock

@@ -1,64 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    aruba (0.5.1)
-      childprocess (~> 0.3.6)
-      cucumber (>= 1.1.1)
-      rspec-expectations (>= 2.7.0)
-    benzo (2.0.0)
-      cocaine (~> 0.4.2)
-    builder (3.1.4)
-    childprocess (0.3.6)
-      ffi (~> 1.0, >= 1.0.6)
-    cocaine (0.4.2)
-    coderay (1.0.8)
-    cucumber (1.2.1)
-      builder (>= 2.1.2)
-      diff-lcs (>= 1.1.3)
-      gherkin (~> 2.11.0)
-      json (>= 1.4.6)
-    deject (0.2.3)
-    diff-lcs (1.1.3)
-    ffi (1.2.0)
-    gherkin (2.11.5)
-      json (>= 1.4.6)
-    json (1.8.3)
-    method_source (0.8.1)
-    pg (0.18.2)
-    pry (0.9.10)
-      coderay (~> 1.0.5)
-      method_source (~> 0.8)
-      slop (~> 3.3.1)
-    pry-remote (0.1.6)
-      pry (~> 0.9)
-      slop (~> 3.0)
-    rake (10.0.3)
-    rspec (2.12.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    rspec-core (2.12.2)
-    rspec-expectations (2.12.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.1)
-    slop (3.3.3)
-    thor (0.16.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  aruba
-  benzo
-  cocaine
-  cucumber
-  deject
-  pg
-  pry
-  pry-remote
-  rake
-  rspec
-  thor
-
-BUNDLED WITH
-   1.11.2