dot_grid 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41426df4e0810af83423a9c902f3fbe5d46acd8f
-  data.tar.gz: 2898d3c296d18abbfc5a906115d73b27084c108f
+  metadata.gz: f5357769bf237ae74776982ba521b37a44442302
+  data.tar.gz: c8072fa7ed15de141c851089cf5518f179c0bbe2
 SHA512:
-  metadata.gz: 295552084e91b9c011444955b965a6a2b69da3cb2899f7172c8398d79c7a93e46a81207afe9283e3c9f6be97337443805f57a83cee6f4fbcb88561c974925f8b
-  data.tar.gz: 0fb0d12fb33927560f5e974c266f9bbb41c79b41a3a026839a960a1c4edbc08d1c46b5e528ab8314bd38d3a203eba4097ef5e843cb9053b947a0cd3dc8e34a38
+  metadata.gz: 8e7885d565a62a20adc9842aca4768294c5808d80f4c762996a44e2fc728fe7bec4f657aa4384810a3a459ea9d0e832a4754da5d9d772550f2bf7628a9c9f19a
+  data.tar.gz: d5250a1bdecfa52f82e504e146708ced242df9dc83a6ef3b8edf884936651c0bbe85c8c0a34c36554a22828643ec4fa3dead31cd02019a456c2300ece1f762bc

data/Gemfile.lock

@@ -3,7 +3,6 @@ PATH
   specs:
     dot_grid (0.0.7)
       prawn (~> 1.1.0)
-      require_all (~> 1.3.2)
       trollop (~> 2.0)
 
 GEM
@@ -24,7 +23,6 @@ GEM
       pdf-core (~> 0.2.5)
       ttfunk (~> 1.2.0)
     rake (10.3.2)
-    require_all (1.3.2)
     rest-client (1.6.7)
       mime-types (>= 1.16)
     rspec (2.14.1)

data/README.md

@@ -13,19 +13,31 @@ A simple ruby file for generating dot grid graph paper.
 
 ## CLI
 
-A basic dot grid page can be generated like this ...
+### A basic dot grid page can be generated like this ...
+    dotgrid -f dot_grid.pdf --page-types dot-grid --spacing 5 --grid-color CFBAEC --dot-weight 0.5 -m 0.0
 
-    bin/dotgrid -f dot_grid.pdf --page-types dot-grid --spacing 5 --grid-color CFBAEC --dot-weight 0.5 -m 0.0
+### A basic planning page can be generated like this ...
+    dotgrid -f planner_w5_c2dfff.pdf  --page-types planner --grid-color CFBAEC --dot-weight 0.5 -m 0.0 --planner-color-1 dddddd --planner-color-2 C2DFFF
 
-A basic planning page can be generated like this ...
+### A regular grid page
+    dotgrid -f grid_c2dfff.pdf --page-types grid  --spacing 5 --grid-color CFBAEC --margin 0.0
 
-  bin/dotgrid -f planner_w5_c2dfff.pdf  --page-types planner --grid-color CFBAEC --dot-weight 0.5 -m 0.0 --planner-color-1 dddddd --planner-color-2 C2DFFF
+### A horizontal rule page
+    dotgrid -f horizontal_rule_c2dfff.pdf --page-types horizontal-rule  --spacing 5 --grid-color CFBAEC --margin 0.0
 
-To get help on the command and its options ...
-    bin/dotgrid --help
+### A checkerboard page
+    dotgrid -f checkerboard_c2dfff.pdf --page-types checkerboard  --spacing 5 --grid-color CFBAEC --margin 0.0
 
+### Multiple page types (either with no spaces after commas or in quotes).
+    dotgrid -f page_types.pdf --page-types "planner, checkerboard, grid, dot_grid"  --spacing 5 --grid-color CFBAEC --margin 0.0
 
-The options and their defaults are ...
+### All of the pages at once ...
+    dotgrid -f page_types.pdf --page-types "planner, checkerboard, grid, dot_grid, horizontal_rule" --spacing 5 --grid-color CFBAEC -m 0.0
+
+### To get help on the command and its options ...
+    dotgrid --help
+
+### The options and their defaults are ...
 
 <table>
 <thead>

data/bin/dotgrid

@@ -1,24 +1,9 @@
 #!/usr/bin/env ruby
 
-require 'rubygems'
-require 'bundler/setup'
+lib = File.expand_path(File.dirname(__FILE__) + '/../lib')
+$LOAD_PATH.unshift(lib) if File.directory?(lib) && !$LOAD_PATH.include?(lib)
 
-# require your gems as usual 
-require 'require_all'
-require 'trollop'
-require_all 'lib'
+require 'dot_grid'
+require 'dot_grid/cli'
 
-opts = Trollop::options do
-  opt :file_name, "File Name", :type => :string, :default => "dotgrid.pdf"
-  opt :orientation, "Orientation of pages (portrait/landscape)", type: :string, default: "portrait"
-  opt :page_types, "Types of pages desired: Types of pages desired: DotGrid, Planner, Grid, HorizontalRule, Checkerboard", type: :string, default: "Planner"
-  opt :dot_weight, "Dot Weight", :type => :float, :default => 1.5
-  opt :margin, "Border", :type => :float, :default => 0.0
-  opt :page_size, "Page Size (LEGAL, LETTER)", :type => :string, :default => "LETTER"
-  opt :grid_color, "Grid Color (RGB)", :type => :string, :default => "B3B3B3"
-  opt :spacing, "Dot Spacing (mm)", :type => :integer, :default => 5
-  opt :planner_color_1, "Planner Left and Footer color", type: :string, default: "CCCCCC"
-  opt :planner_color_2, "Planner Right color", type: :string, default: "0099ff"
-end
-
-dot_grid_generator = DotGrid::Generator.new(opts).generate
+DotGrid::CLI.execute(ARGV)

data/dot_grid.gemspec

@@ -21,5 +21,4 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "coveralls"
   gem.add_dependency "prawn", '~> 1.1.0'
   gem.add_dependency "trollop", '~> 2.0'
-  gem.add_dependency "require_all", '~> 1.3.2'
 end

data/lib/dot_grid/cli.rb

@@ -0,0 +1,23 @@
+require 'trollop'
+
+module DotGrid
+  class CLI
+    def self.execute(argv)
+
+      opts = Trollop::options argv do
+        opt :file_name, "File Name", :type => :string, :default => "dotgrid.pdf"
+        opt :orientation, "Orientation of pages (portrait/landscape)", type: :string, default: "portrait"
+        opt :page_types, "Types of pages desired: Types of pages desired: DotGrid, Planner, Grid, HorizontalRule, Checkerboard", type: :string, default: "Planner"
+        opt :dot_weight, "Dot Weight", :type => :float, :default => 1.5
+        opt :margin, "Border", :type => :float, :default => 0.0
+        opt :page_size, "Page Size (LEGAL, LETTER)", :type => :string, :default => "LETTER"
+        opt :grid_color, "Grid Color (RGB)", :type => :string, :default => "B3B3B3"
+        opt :spacing, "Dot Spacing (mm)", :type => :integer, :default => 5
+        opt :planner_color_1, "Planner Left and Footer color", type: :string, default: "CCCCCC"
+        opt :planner_color_2, "Planner Right color", type: :string, default: "0099ff"
+      end
+
+      DotGrid::Generator.new(opts).generate
+    end
+  end
+end

data/lib/dot_grid/version.rb

@@ -1,3 +1,3 @@
 module DotGrid
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/lib/dot_grid.rb

@@ -1,3 +1,4 @@
+require 'dot_grid/cli'
 require 'dot_grid/generator'
 require 'dot_grid/document'
 require 'dot_grid/bounding_box'

data/spec/lib/dot_grid/cli_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+describe "DotGrid::CLI" do
+  describe ".execute" do
+    let(:argv) { [] }
+    let(:generator) { double('generator') }
+
+    before do
+      allow(DotGrid::Generator).to receive(:new).and_return(generator)
+      allow(generator).to receive(:generate)
+    end
+
+    it "uses trollop to process the options" do
+      expect(Trollop).to receive(:options).with(argv)
+      DotGrid::CLI.execute(argv)
+    end
+
+    it "creates a new generator" do
+      expect(DotGrid::Generator).to receive(:new).and_return(generator)
+      DotGrid::CLI.execute([])
+    end
+
+    it "calls generate on the generator" do
+      expect(generator).to receive(:generate)
+      DotGrid::CLI.execute([])
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dot_grid
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Scott LaBounty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-28 00:00:00.000000000 Z
+date: 2014-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -80,20 +80,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: require_all
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.2
 description: Dot Grid planner PDF generator.
 email:
 - slabounty@gmail.com
@@ -111,11 +97,11 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- base
 - bin/dotgrid
 - dot_grid.gemspec
 - lib/dot_grid.rb
 - lib/dot_grid/bounding_box.rb
+- lib/dot_grid/cli.rb
 - lib/dot_grid/document.rb
 - lib/dot_grid/generator.rb
 - lib/dot_grid/page/checkerboard.rb
@@ -132,6 +118,7 @@ files:
 - lib/dot_grid/pattern/pattern.rb
 - lib/dot_grid/pattern/square_grid.rb
 - lib/dot_grid/version.rb
+- spec/lib/dot_grid/cli_spec.rb
 - spec/lib/dot_grid/document_spec.rb
 - spec/lib/dot_grid/generator_spec.rb
 - spec/lib/dot_grid/page/checkerboard_spec.rb
@@ -172,6 +159,7 @@ signing_key:
 specification_version: 4
 summary: Dot Grid planner PDF generator.
 test_files:
+- spec/lib/dot_grid/cli_spec.rb
 - spec/lib/dot_grid/document_spec.rb
 - spec/lib/dot_grid/generator_spec.rb
 - spec/lib/dot_grid/page/checkerboard_spec.rb

data/base

@@ -1,21 +0,0 @@
-# Base planner
-bin/dotgrid -f planner_w5_c2dfff.pdf  --page-types planner --grid-color CFBAEC --dot-weight 0.5 --margin 0.0 --planner-color-1 dddddd --planner-color-2 C2DFFF
-bin/dotgrid -f planner_w75_c2dfff.pdf --page-types planner --grid-color CFBAEC --dot-weight 0.75 --margin 0.0 --planner-color-1 dddddd --planner-color-2 C2DFFF
-
-# Dot grid
-bin/dotgrid -f dot_grid_c2dfff.pdf --page-types dot_grid --spacing 5 --grid-color CFBAEC --margin 0.0
-
-# Regular grid
-bin/dotgrid -f grid_c2dfff.pdf --page-types grid  --spacing 5 --grid-color CFBAEC --margin 0.0
-
-# Horizontal rule
-bin/dotgrid -f horizontal_rule_c2dfff.pdf --page-types horizontal-rule  --spacing 5 --grid-color CFBAEC --margin 0.0
-
-# Checkerboard
-bin/dotgrid -f checkerboard_c2dfff.pdf --page-types checkerboard  --spacing 5 --grid-color CFBAEC --margin 0.0
-
-# Page Types (either with no spaces after commas or in quotes).
-bin/dotgrid -f page_types.pdf --page-types "planner, checkerboard, grid, dot_grid"  --spacing 5 --grid-color CFBAEC --margin 0.0
-
-# Everything all at once ...
- bin/dotgrid -f page_types.pdf --page-types "planner, checkerboard, grid, dot_grid, horizontal_rule" --spacing 5 --grid-color CFBAEC -m 0.0