trenni-markdown 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80c7291285ffcd0dd7eee1a52a381007aa36c6bb
-  data.tar.gz: 271bb81c07044631c1ffd593e25e03975925e5fe
+  metadata.gz: 5ab15103a8d530d275194e7c0767fc37c4bef965
+  data.tar.gz: 1e8a9b672609cfed81abe421a8248e5101ba0543
 SHA512:
-  metadata.gz: d5ca7845a950149279de439986742b331aecbcf4499bd2ff87dada9045d388bb07b2d7c1ba32df9ad432843d9bd310d9a899513ae3f9bce503042482ddebeb71
-  data.tar.gz: f08e25da04fb56720131cd9f1851a2365a32e3e18b44ab2e9639cfbcf329b40e4bb6e9037b39eb0a93a307549ca59320cb0bea9380cf08fc86d20dac870030ce
+  metadata.gz: 9934ffa244b38f2dde2ac84f0e7eba80707f200a2dd6400bd796bf352d4ae45085fde642df4b140da4641507af68ad64cff3f4262fe35cdfad4602bcb2802e56
+  data.tar.gz: a9d3a1afd1aad523be5b6be5975640d490558da0256ac6da0428307c1ed28c4d72e2e4732190d84e64ec4ccf959bbd286da40271bd903ee45cd966876db14ea0

data/README.md

@@ -1,6 +1,6 @@
 # Trenni::Markdown
 
-Trenni::Markdown is a light-weight (deliberately) simple Markdown parser. It doesn't cover the entire spec but only a small subset required for implementing [literate](https://en.wikipedia.org/wiki/Literate_programming) unit tests, which are markdown documents which include unit tests.
+Trenni::Markdown is a deliberately light-weight and simple Markdown parser. It doesn't cover the entire spec but only a small subset required for implementing [literate](https://en.wikipedia.org/wiki/Literate_programming) unit tests, which are markdown documents which include unit tests.
 
 [![Build Status](https://secure.travis-ci.org/ioquatix/trenni-markdown.svg)](http://travis-ci.org/ioquatix/trenni-markdown)
 [![Code Climate](https://codeclimate.com/github/ioquatix/trenni-markdown.svg)](https://codeclimate.com/github/ioquatix/trenni-markdown)
@@ -38,7 +38,7 @@ Or install it yourself as:
 
 A command line binary is included for basic transforms (using [examples/test.md](examples/test.md) in this example):
 
-	$ trenni-markdown -g RSpec examples/test.md
+	$ trenni-markdown generate -g RSpec examples/test.md
 	RSpec.describe String.new("Test") do
 
 		# This test checks that strings report the inclusion of letters correctly.

data/bin/trenni-markdown

@@ -1,21 +1,27 @@
-#!/usr/bin/env Ruby
+#!/usr/bin/env ruby
 
-require 'trenni/markdown'
-require 'trenni/markdown/generators'
+# Copyright, 2012, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
 
-require 'trollop'
+require 'trenni/markdown/command'
 
-OPTIONS = Trollop::options do
-	opt :generator, "Which generator to use for converting markdown.", :type => :string, :default => 'Ruby'
-end
+top = Trenni::Markdown::Command::Top.parse(ARGV)
 
-generator_class = Trenni::Markdown::Generators.const_get(OPTIONS[:generator])
-
-ARGV.each do |path|
-	buffer = Trenni::FileBuffer.new(path)
-	generator = generator_class.new
-	
-	Trenni::Markdown::Parser.new(buffer, generator).parse!
-	
-	puts generator.output
-end
+top.invoke

data/lib/trenni/markdown/command.rb

@@ -0,0 +1,69 @@
+# Copyright, 2016, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+require_relative '../markdown'
+require_relative 'generators'
+
+require 'samovar'
+
+module Trenni
+	module Markdown
+		module Command
+			class Generate < Samovar::Command
+				options do
+					option "-g/--generator <name>", "The class to use for the conversion process.", default: 'Ruby'
+				end
+				
+				many :paths, "The paths to convert."
+				
+				def generator_class
+					Trenni::Markdown::Generators.const_get(@options[:generator])
+				end
+				
+				def invoke
+					@paths.each do |path|
+						buffer = Trenni::FileBuffer.new(path)
+						generator = generator_class.new
+						
+						Trenni::Markdown::Parser.new(buffer, generator).parse!
+						
+						puts generator.output
+					end
+
+				end
+			end
+			
+			class Top < Samovar::Command
+				self.description = "Convert markdown into other formats."
+				
+				nested '<command>',
+					'generate' => Generate
+				
+				def invoke(program_name: File.basename($0))
+					if @command
+						@command.invoke
+					else
+						print_usage(program_name)
+					end
+				end
+			end
+		end
+	end
+end

data/lib/trenni/markdown/version.rb

@@ -20,6 +20,6 @@
 
 module Trenni
 	module Markdown
-		VERSION = "0.2.0"
+		VERSION = "0.3.0"
 	end
 end

data/trenni-markdown.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
 	spec.require_paths = ["lib"]
 
 	spec.add_dependency "trenni", "~> 1.6.0"
-  spec.add_dependency "trollop", "~> 2.0.0"
+	spec.add_dependency "samovar", "~> 1.2.0"
 
 	spec.add_development_dependency "bundler", "~> 1.11"
 	spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trenni-markdown
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-31 00:00:00.000000000 Z
+date: 2016-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trenni
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.6.0
 - !ruby/object:Gem::Dependency
-  name: trollop
+  name: samovar
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -100,6 +100,7 @@ files:
 - examples/test.md
 - examples/unit_test.md
 - lib/trenni/markdown.rb
+- lib/trenni/markdown/command.rb
 - lib/trenni/markdown/generator.rb
 - lib/trenni/markdown/generators.rb
 - lib/trenni/markdown/generators/rspec.rb