fresh_vector_salad 0.0.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54d64a59bf8a6e9ab5fa08ee375b6367c63645e2
-  data.tar.gz: d36a489c7dfd1024f6352b8d22b5ce3ba464a915
+  metadata.gz: a64538d275583c623fb846e733d581b1bca67317
+  data.tar.gz: 0cb5c1d8aceb0dd7d7bd28eea2486e5ece847720
 SHA512:
-  metadata.gz: 30506dee6d666a24ae5ca0df4eb56f7d5705046a0e45dc0214cdd612a5097526c51775e8cb038f671a90ee493c5cee1997c9830d3fd1942e7fb1cb3fd3168638
-  data.tar.gz: b0194a2d9d309eb2b4d6eca1dc6202fd72b466f55c6b712bc09518ed0c039e83581892bc90b24e0b2f078e7a06f59c955ad8d82dcd012dd87519f6026e61e40d
+  metadata.gz: 951fa9c765fcd691c52b4aa4e2cad6577200ffb27cd41c2d3e66b73721213425ede928fc2ea6917921d66613a15bb903dac535183ed3a757f1df1482be256954
+  data.tar.gz: 422873b59b00e9d828dfd4693e54bce8b0b37e5547b38461f869638b37ab2ea8a4e4865bd8859f1a2be939e88335081f1bb8dcf627a53e810833eaf16d942f10

data/bin/fresh_vector_salad

@@ -1,109 +1,67 @@
 #!/usr/bin/env ruby
 
-require 'fresh_vector_salad'
-require 'optparse'
-require 'ostruct'
-require 'tk'
-require 'tkextlib/tkimg'
-require 'open3'
-require 'expect'
-require 'pty'
+require "vector_salad/optparse"
+require "fresh_vector_salad"
+require "optparse"
+require "ostruct"
+require "tk"
+require "tkextlib/tkimg"
+require "open3"
+require "expect"
+require "pty"
 #require 'listen'
 
 module FreshVectorSalad
-  class FreshOptparse
-    #
-    # Return a structure describing the options.
-    #
-    def self.parse(args)
-      # The options specified on the command line will be collected in *options*.
-      # We set default values here.
-      options = OpenStruct.new
-      options.verbose = false
-      options.dpi = 90
-
-      opt_parser = OptionParser.new do |opts|
-        opts.banner = "Usage: vrs [options]"
-
-        opts.separator ""
-        opts.separator "Specific options:"
-
-        opts.on('-p', "--path PATH",
-                "PATH to the files.") do |path|
-          #strip trailing slash
-          path = path =~ /\/\z/ ? path[0..-2] : path
-          options.path = path
-        end
-
-        opts.on('-d', "--dpi [DPI]",
-                "Export DPI (default 90). Use to shrink or expand the preview.") do |dpi|
-          options.dpi = dpi
-        end
-
-        opts.on("--crop CROP",
-                "Set width and height manually, format WIDTHxHEIGHT, e.g: 400x600.") do |crop|
-          options.width, options.height = crop.split('x').map(&:to_i)
-        end
-
-        opts.on('-f', "--filename FILENAME",
-                "FILENAME (without extension) to compile from and render to.") do |file|
-          options.file = file
-        end
-
-        opts.on("-v", "--[no-]verbose", "Run verbosely") do |v|
-          options.verbose = v
-        end
-
-        opts.separator ""
-        opts.separator "Common options:"
-
-        # No argument, shows at tail.  This will print an options summary.
-        # Try it and see!
-        opts.on_tail("-h", "--help", "Show this message") do
-          puts opts
-          exit
-        end
-
-        # Another typical switch to print the version.
-        opts.on_tail("--version", "Show version") do
-          puts FreshVectorSalad::VERSION
-          exit
-        end
-      end
-
-      opt_parser.parse!(args)
-      options
-    end
-  end
-
-
   class Callbacks
     def initialize(options, image, label)
       @options, @image, @label = options, image, label
     end
 
     def success
-      @image.file = "#{@options.path}/#{@options.file}.png"
+      @image.file = "#{@options.naked_file}.png"
       @label.height = @image.height + 10
       @label.width = @image.width + 10
-      @label.background = 'white'
+      @label.background = "white"
       @label.pack
     end
 
     def error
-      @label.background = 'red'
+      @label.background = "red"
+    end
+  end
+end
+
+module VectorSalad
+  class Optparse
+    defaults[:verbose] = false
+    defaults[:dpi] = 90
+
+    self.tool_name = "fresh_vector_salad"
+
+    optparse.on_head("-d", "--dpi DPI", "Export DPI (default 90). Use to shrink or expand the preview.") do |dpi|
+      options.dpi = dpi
+    end
+
+    optparse.on_head("-v", "--[no-]verbose", "Run verbosely") do |v|
+      options.verbose = v
+    end
+
+    optparse.on_tail("--version", "Show version") do
+      puts FreshVectorSalad::VERSION
+      exit
     end
   end
 end
 
-options = FreshVectorSalad::FreshOptparse.parse(ARGV)
-options.filepath = "#{options.path}/#{options.file}"
+ARGV << "-h" if ARGV.empty?
+options = VectorSalad::Optparse.parse(ARGV)
+options.naked_file = options.file[0...-3]
 
 TkRoot.new do
   title "Fresh Vector Salad"
 end
 
-image = TkPhotoImage.new()
+image = TkPhotoImage.new
 
 label = TkLabel.new
 label.image = image
@@ -117,9 +75,9 @@ fvs.auto_compile
   #fvs.auto_compile if modified.any?{ |m| m =~ /\.rb$/ }
 #end.start
 Thread.new do
-  last = File.stat("#{options.filepath}.rb").mtime
-  while true
-    now = File.stat("#{options.filepath}.rb").mtime
+  last = File.stat(options.file).mtime
+  loop do
+    now = File.stat(options.file).mtime
     if now > last
       fvs.auto_compile
       last = now

data/fresh_vector_salad.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'fresh_vector_salad/version'
+require "fresh_vector_salad/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "fresh_vector_salad"
@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["simon@sfcgeorge.co.uk"]
   spec.summary       = %q{Fresh View Vector Salad Images}
   spec.description   = %q{Live reloads images generated by Vector Salad}
-  spec.homepage      = ""
+  spec.homepage      = "https://github.com/sfcgeorge/fresh_vector_salad"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")
@@ -18,8 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test)/})
   spec.require_paths = ["lib"]
 
-  #spec.add_dependency "listen", "~> 2.8"
-  spec.add_dependency "vector_salad", "~> 0.0"
+  spec.add_dependency "vector_salad", "~> 0.2"
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/fresh_vector_salad/version.rb

@@ -1,3 +1,3 @@
 module FreshVectorSalad
-  VERSION = "0.0.1"
+  VERSION = "0.2.0"
 end

data/lib/fresh_vector_salad.rb

@@ -1,6 +1,6 @@
 require "fresh_vector_salad/version"
-require 'vector_salad/export_with_magic'
-require 'ostruct'
+require "vector_salad/export_with_magic"
+require "ostruct"
 
 module FreshVectorSalad
   class Fresh
@@ -15,72 +15,48 @@ module FreshVectorSalad
     end
 
     def auto_compile
-      puts 'Compiling...'
+      puts "Compiling..."
       start = Time.now
 
-      #_, _, stderr = start_vector_salad
-      #if e = stderr.gets
-        #puts e
-        #@callbacks.error
-      #else
-        #puts "Compiled in #{Time.now - start} seconds."
-        #auto_render
-      #end
-
       begin
-        options = OpenStruct.new
-        options.file = "#{@o.path}/#{@o.file}.rb"
-        options.width = @o.width
-        options.height = @o.height
-        o = VectorSalad::ExportWithMagic.new(options).export
-        File.open("#{@o.path}/#{@o.file}.svg", 'w') do |file|
-          file.sync = true
-          file.write(o)
-          file.fsync
-        end
-        File.write("#{@o.path}/#{@o.file}.svg", o)
+        File.write "#{@o.naked_file}.svg",
+          VectorSalad::ExportWithMagic.new(@o).export
         puts "Compiled in #{Time.now - start} seconds."
         auto_render
       rescue Exception => e
         puts e.inspect
-        e.backtrace.each{ |l| puts l }
+        e.backtrace.each { |l| puts l }
         @callbacks.error
       end
     end
 
-    def start_vector_salad
-      vs = "vector_salad -f \"#{@o.path}/#{@o.file}.rb\" > \"#{@o.path}/#{@o.file}.svg\""
-      return Open3.popen3(vs)
-    end
-
     def auto_render
-      puts 'Rendering...'
+      puts "Rendering..."
       start = Time.now
       if @ink_i.nil?
-        puts 'Starting Inkscape'
-        @ink_o, @ink_i, _ = start_inkscape
+        puts "Starting Inkscape"
+        @ink_o, @ink_i, _x = start_inkscape
       end
 
       begin
         @ink_o.expect(">") do |result|
-          result.each{ |r| puts r }
-          @ink_i.puts("\"#{@o.path}/#{@o.file}.svg\" --export-background=white --export-dpi=#{@o.dpi} --export-png=\"#{@o.path}/#{@o.file}.png\"")
+          result.each { |r| puts r }
+          @ink_i.puts("\"#{@o.naked_file}.svg\" --export-background=white --export-dpi=#{@o.dpi} --export-png=\"#{@o.naked_file}.png\"")
         end
         @ink_o.expect("Bitmap saved") do |result|
-          result.each{ |r| puts r }
+          result.each { |r| puts r }
         end
         @callbacks.success
         puts "Rendered in #{Time.now - start} seconds."
       rescue Exception => e
         puts e.inspect
-        e.backtrace.each{ |l| puts l }
+        e.backtrace.each { |l| puts l }
         @callbacks.error
       end
     end
 
     def start_inkscape
       ink = "inkscape -z --shell"
-      #Open3.popen3(ink)
       PTY.spawn(ink)
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fresh_vector_salad
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Simon George
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-19 00:00:00.000000000 Z
+date: 2015-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vector_salad
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -69,7 +69,7 @@ files:
 - fresh_vector_salad.gemspec
 - lib/fresh_vector_salad.rb
 - lib/fresh_vector_salad/version.rb
-homepage: ''
+homepage: https://github.com/sfcgeorge/fresh_vector_salad
 licenses:
 - MIT
 metadata: {}