model_schema 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71d0f2c2d2b1fb23f4b1120c7f7dd2f800b2e303
-  data.tar.gz: d8b9fa7fd9ed35c9a682244241502b05106af5ed
+  metadata.gz: e819b3df6515baecd8bac8bf213f1abd288e8217
+  data.tar.gz: 35b2388aaa00737be74417ff2cec92ddc62adbee
 SHA512:
-  metadata.gz: a8166541034ee1c12f7fd2d6ec39829509651548e7c44bf801912e4cca9875201a72b621b4f6065c01c6b33afe84d14455f1e74cebbfba2cc5c8bb77ce258cf2
-  data.tar.gz: dddbdd9f473e7b518a145747fc09d772cab97ff54ca89df0d640f42efb86f7bcb905c679467514642a2252316dc09fc578fcec53b4037de489d9dd6a1d2213de
+  metadata.gz: 77899af8c7f4087cf5757afe87908d2b5687f638a09842f23b45e9dcdb842b51c0a3dbf95af738e17057972cf5d39c3a7d8559a32526d27a15b30a2c1cb9c9c1
+  data.tar.gz: 6ee5e09645ec9328ab3564586d243e157c2253be51da737ae24dcb71157c6b3bbba6ddab949dac1eef8beffad17a1c6cda867b5e9bf2bef84e1aa9fbcf9d1e31

data/README.md

@@ -130,7 +130,7 @@ the `dump_model_schema` executable. It will automatically dump an up-to-date
 `model_schema` block in each Sequel Model class. Use it like so:
 
 ```sh
-$ dump_model_schema -m [model_file] -c [connection_string]
+$ dump_model_schema -c [connection_string] model_file [model_file ...]
 ```
 
 where `model_file` is a path to a ruby file that contains a single Sequel
@@ -138,10 +138,10 @@ Model, and `connection_string` is the database connection string to pass to
 `Sequel.connect()`.
 
 `dump_model_schema` will insert a `model_schema` block right after the
-definition of the Sequel Model class. Specifically, it looks for a line of the
-form `class SomeClassName < Sequel::Model(:table_name)`, and inserts a valid
-schema for table `table_name` directly after that line. Note that
-`dump_model_schema` overwrites the model file.
+definition of the Sequel Model class in `model_file`. Specifically, it looks
+for a line of the form `class SomeClassName < Sequel::Model(:table_name)`, and
+inserts a valid schema for table `table_name` directly after that line. Note
+that `dump_model_schema` overwrites `model_file`.
 
 For instance, say you had a file `items.rb` that looks like this:
 
@@ -155,7 +155,7 @@ end
 If you run:
 
 ```sh
-$ dump_model_schema -m items.rb -c [connection_string]
+$ dump_model_schema -c [connection_string] items.rb
 ```
 
 `items.rb` might now look like:
@@ -179,6 +179,13 @@ By default, `dump_model_schema` assumes a tab size of 2 spaces, but you can
 change this with the `-t` option. Pass an integer representing the number of
 spaces, or 0 if you want to use hard tabs.
 
+You may specify multiple `model_file`s as distinct arguments, and each will
+have its `model_schema` dumped. This can be done easily with shell expansion:
+
+```sh
+$ dump_model_schema -c [connection_string] models/*.rb
+```
+
 You may see help text with `dump_model_schema -h` and view the version of
 ModelSchema with `dump_model_schema -v`.
 

data/lib/model_schema/dumper.rb

@@ -11,11 +11,8 @@ module ModelSchema
       opts[:tabbing] = 2
 
       parser = OptionParser.new do |p|
-        p.banner = "Usage: dump_model_schema [options]"
-
-        p.on('-m', '--model MODEL', 'Model file to dump schema in') do |model|
-          opts[:model] = model
-        end
+        p.banner = 'Usage: dump_model_schema [options] model_file [model_file ...]'
+        p.separator "\nDumps a valid model_schema block in each given model_file.\n\n"
 
         p.on('-c', '--connection CONNECTION',
              'Connection string for database') do |connection|
@@ -38,24 +35,42 @@ module ModelSchema
         end
       end
 
-      parser.parse(args)
+      model_files = parser.parse(args)
 
       # model and connection are required
-      abort 'Must provide a model file with -m or --model.' if !opts[:model]
+      abort 'Must provide at least one model file.' if model_files.empty?
       abort 'Must provide a connection string with -c or --connection.' if !opts[:connection]
 
-      dump_model_schema(opts)
-    end
-
-    # Dumps the model schema based on the given options (see option parsing above).
-    def self.dump_model_schema(opts)
-      model_info = parse_model_file(opts[:model])
-      abort "Couldn't find class that extends Sequel::Model" if !model_info
-
       db = Sequel.connect(opts[:connection])
       db.extension(:schema_dumper)
 
-      klass = Class.new(Sequel::Model(model_info[:table_name]))
+      if db.is_a?(Sequel::Postgres::Database)
+        # include all Postgres type extensions so schema dumps are accurate
+        db.extension(:pg_array, :pg_enum, :pg_hstore, :pg_inet, :pg_json,
+                     :pg_range, :pg_row)
+      end
+
+      had_error = false
+      model_files.each do |path|
+        begin
+          dump_model_schema(db, path, opts)
+        rescue StandardError, SystemExit => error
+          # SystemExit error messages are already printed by abort()
+          $stderr.puts error.message if error.is_a?(StandardError)
+          had_error = true
+        end
+      end
+
+      exit 1 if had_error
+    end
+
+    # Dumps a valid model_schema into the given file path. Accepts options as
+    # per the OptionParser above.
+    def self.dump_model_schema(db, path, opts)
+      model = parse_model_file(path)
+      abort "In #{path}, couldn't find class that extends Sequel::Model" if !model
+
+      klass = Class.new(Sequel::Model(model[:table_name]))
       klass.db = db
       klass.plugin(ModelSchema::Plugin)
 
@@ -66,7 +81,7 @@ module ModelSchema
 
       # account for indentation
       tab = opts[:tabbing] == 0 ? "\t" : ' ' * opts[:tabbing]
-      schema_indentation = model_info[:indentation] + tab
+      schema_indentation = model[:indentation] + tab
       command_indentation = schema_indentation + tab
 
       commands = commands.lines.map {|l| l == "\n" ? l : command_indentation + l}.join
@@ -76,8 +91,8 @@ module ModelSchema
                     "#{commands}\n",
                     "#{schema_indentation}end\n"]
 
-      lines = model_info[:lines_before] + dump_lines + model_info[:lines_after]
-      File.write(opts[:model], lines.join)
+      lines = model[:lines_before] + dump_lines + model[:lines_after]
+      File.write(path, lines.join)
     end
 
     # Parses the model file at the given path, returning a hash of the form:
@@ -100,7 +115,7 @@ module ModelSchema
           if table_name[0] == ':'
             table_name = table_name[1..-1].to_sym
           else
-            abort "Can't find a symbol table name on line: #{line}"
+            abort "In #{path}, can't find a symbol table name in line: #{line}"
           end
 
           # indentation for model_schema block

data/lib/model_schema/version.rb

@@ -1,3 +1,3 @@
 module ModelSchema
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: model_schema
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Karthik Viswanathan