pre-commit 0.9.2 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ff1322d028fe5837cfde982be38e20eee79b4a0
-  data.tar.gz: 8e5f8efaffab2c8afb5d2fafbdfd1ef30b424569
+  metadata.gz: 7d14a6ce5ee2717ae7d88d9fb68b80dbfd6380e1
+  data.tar.gz: 1358302054df917ca046543c2cb075c81323e0ce
 SHA512:
-  metadata.gz: ae50c6a33ca6bc51724fd9f04f803281832d58873d38072e2c8b4690805e6d1b4aa1ab980887d8a6e589c4dd18fa400b31320593375f057947acc30449d4abe0
-  data.tar.gz: b0d7901498f8aeca050530e769e5c4403678c556cd78fbab6a8a5482f3b53e4ccccaf28e6e4b228b27bfb65a3849ffe6b1660327ba19f2b5b8bd2a654cfc4c07
+  metadata.gz: 67c1e0fa3d6aa160683efe67aa0cc1f9540a73a284d1cc2dd5454ad45b1f4bb79e327c34e008fb92096edae4f4382a45a1d09ed862c000dc3d644e84c6717b02
+  data.tar.gz: 72d69a94f724d062ac47ee938e531e34c7d5f38b73ec900cb0846392e4536f3303000c5f06730bf941f918a8f517000070b17d30e5ca4f2e67ab3171aefbfd3a

data/lib/pre-commit/checks/migration_check.rb

@@ -1,27 +1,32 @@
 module PreCommit
   class MigrationCheck
-    def self.call(staged_files)
-      migration_present = migration_file_present?(staged_files)
-      schema_change = schema_file_present?(staged_files)
+    class << self
+      def call(staged_files)
+        migration_files = migration_files(staged_files)
+        schema_files = schema_files(staged_files)
 
-      if migration_present && !schema_change
-        "It looks like you're adding a migration, but did not update the schema file"
-      elsif schema_change && !migration_present
-        "You're trying to change the schema without adding a migration file"
+        if migration_files.any? && schema_files.none?
+          "It looks like you're adding a migration, but did not update the schema file"
+        elsif migration_files.none? && schema_files.any?
+          "You're trying to change the schema without adding a migration file"
+        elsif migration_files.any? && schema_files.any?
+          versions = migration_files.map { |f| f[/\d+/] }
+          schema = schema_files.map { |f| File.read(f) }.join
+          missing_versions = versions.select { |version| !schema.include?(version) }
+          if missing_versions.any?
+            "You did not add the schema versions for #{versions.join(', ')} to #{schema_files.join(' or ')}"
+          end
+        end
       end
-    end
 
-    def self.migration_file_present?(staged_files)
-      staged_files.any? { |file| file =~ /db\/migrate\/.*\.rb/ }
-    end
+      private
 
-    def self.schema_file_present?(staged_files)
-      staged_files.any? do |file|
-        basename = File.basename(file)
+      def migration_files(staged_files)
+        staged_files.grep(/db\/migrate\/.*\.rb/)
+      end
 
-        [/schema\.rb/i, /structure.*\.sql/].any? do |regex|
-          basename =~ regex
-        end
+      def schema_files(staged_files)
+        staged_files.select { |f| File.basename(f) =~ /schema\.rb|structure.*\.sql/ }
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pre-commit
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.10.0
 platform: ruby
 authors:
 - Shajith Chacko, Josh Lubaway
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-16 00:00:00.000000000 Z
+date: 2013-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs