sqltorial 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d29622c64654fc0aec2d0d839d6a0c48e67c9fd
-  data.tar.gz: 028fb7bb71fdbc196e321998a4cc2b70c81d9958
+  metadata.gz: b81ab5d2e41712b52e7b96f1f6332e5a28c2ee01
+  data.tar.gz: 88ad7165935ab617c70786ddd96546c2545c2e35
 SHA512:
-  metadata.gz: 773c24331624a956878faa2fe49ccec85e9419947ad05ea9c0975d02853aede336fe9ba70ca2291190fbe72f472ead363edd2d5b5472de89c0f63a5d3e05dfa8
-  data.tar.gz: 97a56dca3e44e5751bea7b6b61936013a78a301c8c09a1b736851a7130fe9fa8ef445d8cb0b2bfb68254f1c0be12fa941af6301090cf6cc1834b21192cc95efc
+  metadata.gz: 1cbc570b9ea4c206a0811816e307ab89d05ef6904ea1250dacd4a976d9a9aebfdd59e601c460b3914a2462e76fbd55d4e5d62d4ae8da6cf1ebfdc98a22abec1a
+  data.tar.gz: dcaf1f0cef469d9ca8fc8b56d15b1b7ff6113368ce1f9c2d3b33a5b8aef26e1c5128166d180d4506df4be0d0483d106edf0e776c3c90ef86ebfedfab04bc8e3a

data/CHANGELOG.md

@@ -6,7 +6,7 @@ All notable changes to this project will be documented in this file.
 
 ### Added
 
-- Nothing.
+- Watch mode.
 
 ### Deprecated
 
@@ -18,7 +18,7 @@ All notable changes to this project will be documented in this file.
 
 ### Fixed
 
-- Nothing.
+- Better handling of whitespace.
 
 ## 0.0.3 - 2015-09-03
 

data/exe/sqltorial

@@ -8,11 +8,14 @@ Escort::App.create do |app|
   app.version SQLtorial::VERSION
   app.summary SQLtorial::SUMMARY
   app.description SQLtorial::DESCRIPTION
+
   app.options do |opts|
     opts.opt :no_results, "Don't Include Results", short: '-n', long: '--no-results', type: :boolean, default: false
     opts.opt :output, "Output File", short: '-o', long: '--output', type: :string, default: 'output.md'
     opts.opt :preface, "Preface File", short: '-p', long: '--preface', type: :string, default: 'preface.md'
+    opts.opt :watch, "Watch Mode", short: '-w', long: '--watch', type: :boolean, default: false
   end
+
   app.action do |options, arguments|
     begin
       SQLtorial::AssembleCommand.new(options, arguments).execute

data/lib/sqltorial/assemble_command.rb

@@ -1,11 +1,25 @@
 require_relative 'sql_to_example'
 require 'sequelizer'
 require 'facets/pathname/chdir'
+require 'listen'
 
 module SQLtorial
   class AssembleCommand < ::Escort::ActionCommand::Base
     include Sequelizer
     def execute
+      global_options[:watch] ? watch : process
+    end
+
+    def watch
+      listener = Listen.to(path) do |modified, added, removed|
+        process
+       end
+      listener.only(/\.sql$/)
+      listener.start
+      sleep while listener.processing?
+    end
+
+    def process
       process_dir.chdir do
         preface = Pathname.new(global_options[:preface]) if global_options[:preface]
         File.open(global_options[:output], 'w') do |f|

data/lib/sqltorial/metadata.rb

@@ -1,5 +1,5 @@
 module SQLtorial
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
   SUMMARY = %q{Knitr, but for SQL files, sorta}
   DESCRIPTION = %q{Ingests a set of commented SQL statements, executes them, and dumps the comments, queries, and results into a markdown file}
   HOMEPAGE = "http://github.com/outcomesinsights/sqltorial"

data/lib/sqltorial/sql_to_example.rb

@@ -3,6 +3,7 @@ require_relative 'query_to_md'
 require_relative 'formatter'
 
 module SQLtorial
+  WHITESPACE_REGEX = /^\s*--/
   class SqlToExample
     attr :file, :db
     def initialize(file, db, number)
@@ -38,16 +39,16 @@ module SQLtorial
     end
 
     def title
-      @title ||= title_line.gsub(/^\s*-+\s*/, '')
+      @title ||= title_line.gsub(WHITESPACE_REGEX, '')
     end
 
     def make_prose_directives_and_query(query)
       lines = query.dup
       prose_lines = []
       lines.shift while lines.first.strip.empty?
-      prose_lines << lines.shift.sub(/^\s*-+\s*/, ' ').chomp.sub(/^ $/, "\n\n") while lines.first =~ /^\s*(-+|$)/
+      prose_lines << lines.shift.sub(WHITESPACE_REGEX, ' ').sub(/^\s*$/, "\n\n") while lines.first && (lines.first =~ WHITESPACE_REGEX || lines.first.empty?)
       directives, prose_lines = prose_lines.partition { |line| Directive.match(line) }
-      [prose_lines.join(''), process_directives(directives), lines.join("\n")]
+      [prose_lines.join(''), process_directives(directives), lines.join]
     end
 
     def number
@@ -74,7 +75,6 @@ module SQLtorial
           puts sql
           puts $!.message
           puts $!.backtrace.join("\n")
-          $stdin.gets
         end
       end
       parts = []
@@ -101,7 +101,7 @@ module SQLtorial
     end
 
     def get_title_and_formatted_lines
-      all_lines = formatted.split("\n")
+      all_lines = formatted.split("\n").map { |l| l += "\n" }
       title_line = all_lines.shift
       [title_line, all_lines]
     end

data/sqltorial.gemspec

@@ -33,4 +33,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "anbt-sql-formatter", "~> 0.0.3"
   spec.add_dependency "facets", "~> 3.0"
   spec.add_dependency "escort", "~> 0.4.0"
+  spec.add_dependency "listen", "~> 3.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sqltorial
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Ryan Duryea
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-09-03 00:00:00.000000000 Z
+date: 2015-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.0
+- !ruby/object:Gem::Dependency
+  name: listen
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 description: Ingests a set of commented SQL statements, executes them, and dumps the
   comments, queries, and results into a markdown file
 email: