dothtml 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e761c595a94b3bbafdbb7b7796ecc2b1f8a6690
-  data.tar.gz: 2aa1330586afdd6bd045b35c29255ee70d0d3ddc
+  metadata.gz: 2b54d4c5977dab60f40ee0b8452e82d12da98864
+  data.tar.gz: fb18ac649d3d42f8b104e449661d5026f7b17f25
 SHA512:
-  metadata.gz: 27d82f94a44ca6052014e949f6bd3dfaf3d3a2958c03ff71016a6ea9418b7f6ec27d84ccc5f2d888036651a461f2e73fe17e6a3380383b0599a2b2487e604df1
-  data.tar.gz: dee8c3c7154326da5120f175e6e4be26a3c1821ae35f922aff673bb1ee6614bd1764a9a455c40b61c25526c606fc402a5f58df8a1c49fc474f7e0dcf807abef3
+  metadata.gz: 3767faa96b216468fa59661e58e52e51bb67c3727c57250205705e6c399d8d9733e4d5a3caa1286afd5b226f905ead7c3ef727c1ebc948b1136a15e541036d50
+  data.tar.gz: de96d861ff797facd40668c3ca8881484461ce46fff95cdf4d7edf7700e98ccb1b66ecdd3d69d29d14e86fe2c77d3dfcec8bc1d6404aa0c7cf3076756aa2a372

data/.gitignore

@@ -12,3 +12,4 @@
 *.o
 *.a
 mkmf.log
+sample

data/CHANGELOG.md

@@ -1,10 +1,23 @@
 # Change Log
 
-## 0.0.3 - 2014-12-23
+## [Unreleased]
+
+
+## [0.1.0] - 2016-02-09
+### Added
+- Rewritten CLI that supports subcommands build, create, and watch
+- Detect/Add presence of outer `graph {}`
+- Added minimal layout detection (neato vs dot)
+- Added support for arbitrary cdn value
+
+### Removed
+- Removed merging of id and class as class attribute is now supported by graphviz.
+
+## [0.0.3] - 2014-12-23
 ### Added
 - Rule to generate an svg file
 
-## 0.0.2 - 2014-12-10
+## [0.0.2] - 2014-12-10
 ### Added
 - This CHANGELOG
 - Added behavior and style files. (no longer in template file)
@@ -22,3 +35,8 @@
 ### Remove
 - Removed embedding of svg images. Not ready for prime time yet.
 - Removed requirement on liquid gem. Default template now in erb.
+
+[Unreleased]: https://github.com/kbrock/dothtml/compare/v0.1.0...HEAD
+[0.2.0]: https://github.com/kbrock/dothtml/compare/v0.0.3...v0.1.0
+[0.0.3]: https://github.com/kbrock/dothtml/compare/v0.0.2...v0.0.3
+[0.0.2]: https://github.com/kbrock/dothtml/compare/v0.0.1...v0.0.2

data/README.md

@@ -4,38 +4,34 @@ Graphviz is a great visualization tool for coding digraphs.
 
 d3 is a great tool for dynamic html presentations.
 
-This tool:
-
-- converts graphviz dot files into html.
-- provides sample guard file
-- Rake tasks
-- hacks class attributes to embed into html file
-- embeds style into html file
-
-TODO:
-- add radio button for class association
-- embed external svg images into html file
-
+Dothtml will convert your Graphviz dot files to nicely formatted html files.
+It can convert them on-demand, or it can constantly convert them as you develop,
+using a simple [Guard](http://guardgem.org/) process.
 
 ## Installation
 
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'dothtml'
+```
+gem install dothtml
 ```
 
-And then execute:
+## Usage
 
-    $ bundle
+When starting a project for the first time, just call `dothtml create` with
+a new directory name.  Dothtml will create the directory with a sample.dot file,
+and then `git init` the directory.
 
-Or install it yourself as:
+Edit the sample.dot file, or just copy it with a new name, and then call
+`dothtml build`.  That's it!  Dothtml has created the .html files.
 
-    $ gem install dothtml
+You can then monitor your live changes to the dot files with `dothtml watch`,
+which will start a Guard process to monitor them.  Change your dot files, and
+they will be built into .html files upon saving.
 
-## Usage
+Once the Guard process has started, you can also open the .html files in your
+browser and automatically have then reload with the
+[LiveReload browser extension](http://livereload.com/extensions/).
 
-TODO: Write usage instructions here
+You can get more information on the command line with `dothtml --help`
 
 ## Similar Projects
 
@@ -43,9 +39,14 @@ TODO: Write usage instructions here
 - https://github.com/kui/octopress-graphviz
 - https://github.com/glejeune/Ruby-Graphviz
 
+## TODO
+
+- Add radio button for class association
+- Embed external svg images into html file
+
 ## Contributing
 
-1. Fork it ( https://github.com/[my-github-username]/dothtml/fork )
+1. Fork it ( https://github.com/kbrock/dothtml/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/dothtml.gemspec

@@ -9,18 +9,29 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Keenan Brock"]
   spec.email         = ["keenan@thebrocks.net"]
   spec.summary       = %q{Make conversion of dot to html easier}
-  spec.description   = %q{Make conversion of dot to html easier}
+  spec.description   = <<-DESCRIPTION
+                          In a world, full of html, and javascript,
+                          there can exist only one graphing library.
+                          But there still is hope in trusty graphviz.
+
+                          This makes the conversion of dot to html
+                          and d3js easier.
+                          DESCRIPTION
   spec.homepage      = "http://github.com/kbrock/dothtml"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.bindir        = 'exe'
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'guard'
-  spec.add_dependency 'guard-rake'
   spec.add_dependency 'nokogiri'
+  spec.add_dependency 'trollop'
+  spec.add_dependency 'colorize'
+  spec.add_dependency 'guard'
+  spec.add_dependency 'guard-shell'
+  spec.add_dependency 'guard-livereload'
   # possibly remove this
   spec.add_dependency 'tilt'
 

data/exe/dothtml

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+
+$LOAD_PATH << File.expand_path("../lib", __dir__)
+require 'dothtml'
+require 'dothtml/cli'
+Dothtml::CLI.new(ARGV).execute

data/lib/dothtml.rb

@@ -1,5 +1,5 @@
-require "dothtml/version"
+require 'dothtml/version'
 
 module Dothtml
-  # Your code goes here...
+  TEMPLATES_DIR = File.expand_path("../templates", __dir__).freeze
 end

data/lib/dothtml/cli.rb

@@ -0,0 +1,129 @@
+require 'trollop'
+require 'dothtml/dot_task'
+
+module Dothtml
+  class CLI
+    VERSION_STRING = "dothtml #{Dothtml::VERSION}"
+
+    COMMANDS = {
+      "build" => {
+        "usage"    => "build [dotfile]",
+        "synopsis" => <<-EOS
+Builds the specified dotfile (or all .dot files, if not specified)
+into .svg and .html files.  This is the default command if nothing
+is specified on the command line.
+        EOS
+      },
+      "create" => {
+        "usage"    => "create <dir>",
+        "synopsis" => <<-EOS
+Generates a new Dothtml repo at the indicated dir.
+        EOS
+      },
+      "watch" => {
+        "usage"    => "watch",
+        "synopsis" => <<-EOS
+Starts a guard process, which automatically does a build as .dot
+files are changed.
+        EOS
+      },
+    }
+
+    COMMAND_NAMES = COMMANDS.keys + %w(version help)
+    DEFAULT_COMMAND = "build"
+
+    attr_reader :args
+
+    def initialize(args)
+      @args = args
+    end
+
+    def execute
+      parse_global_options
+      parse_command_options
+      execute_command
+    end
+
+    private
+
+    attr_accessor :command
+
+    def parse_global_options
+      global_synopsis_parts = COMMANDS.each_value.flat_map do |v|
+        [indent(v["usage"], 1), indent(v["synopsis"], 2)]
+      end
+      global_synopsis = "\nCommands:\n#{global_synopsis_parts.join("\n")}".chomp
+
+      Trollop.options(args) do
+        version  VERSION_STRING
+        usage    "<command> [command_options]"
+        synopsis global_synopsis
+        stop_on  COMMAND_NAMES
+      end
+    end
+
+    def parse_command_options
+      self.command = (args.shift || DEFAULT_COMMAND).downcase
+      Trollop.die "invalid command, '#{command}'" unless COMMAND_NAMES.include?(command)
+      return unless COMMANDS.key?(command)
+
+      command_options  = COMMANDS[command]
+      command_synopsis = "\n#{indent(command_options["synopsis"], 1)}".chomp
+
+      Trollop.options(args) do
+        version  VERSION_STRING
+        usage    command_options["usage"]
+        synopsis command_synopsis
+      end
+    end
+
+    def indent(string, amount)
+      prefix = "  " * amount
+      string.lines.map { |l| "#{prefix}#{l}" }.join
+    end
+
+    #
+    # Command handlers
+    #
+
+    def execute_command
+      send("#{command}_command")
+    end
+
+    def build_command
+      files =
+        if args.empty?
+          Dir.glob("*.dot").sort
+        else
+          args.select { |a| a.end_with?(".dot") }
+        end
+
+      DotTask.new.build(files)
+    end
+
+    def create_command
+      dir = args.shift
+      Trollop.die "dir not specified" if dir.nil?
+
+      DotTask.new.create(dir)
+    end
+
+    def watch_command
+      guardfile = File.join(TEMPLATES_DIR, "Guardfile")
+      env = {
+        "DOTHTML_PATH"   => File.expand_path($0),
+        "BUNDLE_GEMFILE" => File.expand_path("../../Gemfile", __dir__)
+      }
+      exec(env, "bundle exec guard -G #{guardfile}")
+    end
+
+    def version_command
+      puts VERSION_STRING
+      exit 0
+    end
+
+    def help_command
+      Trollop.educate
+    end
+  end
+end

data/lib/dothtml/dot_helper.rb

@@ -4,6 +4,9 @@ require 'set'
 require 'open3'
 
 class DotHelper
+  GRAPH_REGEX = /\b(?:di)?graph\b[^\[]*\{/mi
+  DOT_REGEX = /->/
+
   def initialize(svg_contents)
     @svg_contents = svg_contents
   end
@@ -16,9 +19,21 @@ class DotHelper
     @dom ||= parse_dom(@svg_contents)
   end
 
+  # return the list of choices provided for a user
+  #
+  # these choices are displayed to modify the data
+  # on the page
+  #
+  # this will add a body css class and trigger a data
+  # event for d3js
   def extractChoices
   end
 
+  # return true if the nodes have descripions?
+  #
+  # This will create a div box where descriptions
+  # can be displayed
+  #
   def descriptions?
     #dom.css("")
   end
@@ -27,7 +42,9 @@ class DotHelper
     dom.css("title").first.content()
   end
 
-  # this currently has too many limitations
+  # Embed svg image links directly into the document
+  #
+  # this currently has too many issues
   # working on making this more friendly
   # assume unique list of filenames
   def images
@@ -67,34 +84,23 @@ class DotHelper
     end
   end
 
-  def merge_id_class(old_id, old_class)
-    new_id, new_class = extract_id_class(old_id)
-    [new_id, [old_class, new_class].compact.join(" ")]
-  end
-
-  # some nodes are of the form <div id="x1 class='other'" class="c1">
-  # assume (class= is present)
-  def fix_node_id(node)
-    new_id, new_class = merge_id_class(node["id"], node["class"])
-    node["id"] = new_id
-    node["class"] = new_class
-    node
-  end
-
   def embed_images
-    dom.at("svg").children.before(images)
+    node.children.before(images)
     self
   end
 
-  def fix_ids
-    dom.xpath("//*[contains(@id,'class=')]").each { |n| fix_node_id(n) }
+  def remove_comments
+    dom.xpath('//comment()').each { |comment| comment.remove }
     self
   end
 
+  def node
+    dom.at("svg")
+  end
 
   # uses a fragment to remove extra xml declarations
   def to_xml
-    dom.at("svg").to_xml
+    node.to_xml
   end
 
   def write(file_name, template_name, locals)
@@ -105,12 +111,36 @@ class DotHelper
     new(svg_from_dot(File.read(filename)))
   end
 
-  def self.from_dot(contents)
-    new(svg_from_dot(contents))
+  def self.detect_language(contents, language = nil)
+    language || ((contents =~ DOT_REGEX) ? 'dot' : 'neato')
+  end
+
+  def self.enhance(contents, language)
+    if contents =~ GRAPH_REGEX
+      contents
+    elsif language == 'dot'
+      <<-GRAPH
+      digraph {
+        #{contents}
+      }
+      GRAPH
+    else
+      <<-GRAPH
+      graph {
+        #{contents}
+      }
+      GRAPH
+    end
+  end
+
+  def self.from_dot(contents, language = 'dot')
+    language = detect_language(contents, language)
+    contents = enhance(contents, language)
+    new(svg_from_dot(contents, language))
   end
 
-  def self.svg_from_dot(contents)
-    Open3.popen3('dot -Tsvg') do |stdin, stdout, stderr|
+  def self.svg_from_dot(contents, language = 'dot')
+    Open3.popen3("#{language} -Tsvg") do |stdin, stdout, stderr|
       stdout.binmode
       stdin.print contents
       stdin.close

data/lib/dothtml/dot_task.rb

@@ -1,78 +1,106 @@
-require 'rake'
-require 'rake/tasklib'
-require_relative 'dot_helper'
+require 'dothtml/dot_helper'
 
 module Dothtml
-  class DotTask < Rake::TaskLib
+  class DotTask
     attr_accessor :template
     attr_accessor :style
     attr_accessor :behavior
     attr_accessor :cdn
     attr_accessor :d3js
 
-    attr_accessor :dot_folder
-    attr_accessor :html_folder
-
-    def initialize(name = :dot)
-      templates = File.expand_path(File.join(File.dirname(__FILE__), "..", "..","templates"))
-      @name     = name
-      @style    = File.join(templates, 'style.css')
-      @behavior = File.join(templates, 'behavior.js')
-      @template = File.join(templates, 'index.html.erb')
+    def initialize
+      @style    = File.join(TEMPLATES_DIR, 'style.css')
+      @behavior = File.join(TEMPLATES_DIR, 'behavior.js')
+      @template = File.join(TEMPLATES_DIR, 'index.html.erb')
       self.cdn  = true
       yield self if block_given?
-      define
     end
 
     def cdn=(val)
-      @d3js = val ? "//cdnjs.cloudflare.com/ajax/libs/d3/3.4.13/d3.min.js" : "d3.v3.js"
+      @cdn = val
+      @d3js = case val
+              when true  then "//cdnjs.cloudflare.com/ajax/libs/d3/3.5.6/d3.min.js"
+              when false then "d3.v3.js"
+              else val
+              end
     end
 
-    def define
-      desc "convert dot file into an html file"
-      task :dot_html, [:src, :target] do |t, params|
-        source = params[:src]
-        target = params[:target]
-
-        puts "#{source} -> #{target}"
-
-        doc = DotHelper.from_dotfile(source).fix_ids#.embed_images
-        doc.write target, @template,
-                  title:    doc.extractTitle,
-                  body:     doc.to_xml,
-                  choices:  doc.extractChoices,
-                  descriptions: doc.descriptions?,
-                  style:    File.read(style),
-                  behavior: File.read(behavior),
-                  d3js:     d3js
+    def build(*files)
+      files.flatten.each do |f|
+        dot_to_svg(f)
+        dot_to_html(f)
       end
+    end
 
-      desc "convert dot file into an svg file"
-      task :dot_svg, [:src, :target] do |t, params|
-        source = params[:src]
-        target = params[:target]
-
-        puts "#{source} -> #{target}"
+    def create(dir)
+      require 'colorize'
 
-        doc = DotHelper.from_dotfile(source).fix_ids#.embed_images
-        File.write(target, doc.to_xml)
+      if Dir.exists?(dir)
+        say_status(:exists, dir)
+      else
+        FileUtils.mkdir_p(dir)
+        say_status(:create, dir)
       end
 
-      rule '.html' => [".dot", style, template, behavior] do |t|
-        Rake::Task["dot_html"].execute(:target => t.name, :src => t.source)
-        Rake::Task["refresh_browser"].invoke
+      sample = File.join(dir, "sample.dot")
+      if File.exists?(sample)
+        say_status(:exists, sample)
+      else
+        sample_source = File.join(TEMPLATES_DIR, "sample.dot")
+        FileUtils.cp(sample_source, sample)
+        say_status(:create, sample)
       end
 
-      rule '.svg' => [".dot"] do |t|
-        Rake::Task["dot_svg"].execute(:target => t.name, :src => t.source)
+      gitignore = File.join(dir, ".gitignore")
+      if File.exists?(gitignore)
+        say_status(:exists, gitignore)
+      else
+        File.write(gitignore, "*.html\n*.svg")
+        say_status(:create, gitignore)
       end
 
-      #TODO find proper tab, offer non chrome options
-      desc "use applescript to refresh front most window in chrome"
-      task :refresh_browser do
-        puts "refreshing browser"
-        `osascript -e 'tell application "Google Chrome" to tell the active tab of its first window to reload'` 
+      git_dir = File.join(dir, ".git")
+      if Dir.exists?(git_dir)
+        say_status(:exists, git_dir)
+      else
+        system("git init", :chdir => dir)
       end
     end
+
+    private
+
+    def dot_to_html(source)
+      target = source.sub(/.dot$/, ".html")
+      puts "#{source} -> #{target}"
+
+      doc = DotHelper.from_dotfile(source)#.embed_images
+      doc.write target, @template,
+                title:    doc.extractTitle,
+                body:     doc.to_xml,
+                choices:  doc.extractChoices,
+                descriptions: doc.descriptions?,
+                style:    File.read(style),
+                behavior: File.read(behavior),
+                d3js:     d3js
+    end
+
+    def dot_to_svg(source)
+      target = source.sub(/.dot$/, ".svg")
+      puts "#{source} -> #{target}"
+
+      doc = DotHelper.from_dotfile(source)#.embed_images
+      File.write(target, doc.to_xml)
+    end
+
+    def say_status(mode, text)
+      mode_text =
+        case mode
+        when :exists then mode.to_s.yellow.bold
+        when :create then mode.to_s.green.bold
+        else              mode.to_s.bold
+        end
+
+      puts "\t#{mode_text}\t#{text}"
+    end
   end
 end

data/lib/dothtml/version.rb

@@ -1,3 +1,3 @@
 module Dothtml
-  VERSION = "0.0.3"
+  VERSION = "0.1.0"
 end

data/templates/Guardfile

@@ -1,6 +1,10 @@
-guard 'rake', :task => :html do
-  watch(/.dot$/)
-  #watch('index.html.erb')
-  #watch('style.css')
-  #watch('behavior.js')
+guard :shell do
+  watch(/.dot$/) do |m|
+    dothtml_path = ENV["DOTHTML_PATH"] || "dothtml"
+    system("#{dothtml_path} build #{m.join(" ")}")
+  end
+end
+
+guard :livereload do
+  watch(/.html$/)
 end

data/templates/sample.dot

@@ -0,0 +1,13 @@
+digraph Sample {
+	graph [ fontname="Helvetica-Bold" ]
+	node  [ id="\N" shape="Mrecord" style="filled" fontname="Helvetica" fillcolor="#ffffff" penwidth="2" ]
+	edge  [ arrowsize="0.5" fontname="Helvetica" ]
+
+	label="Sample"
+	style="rounded"
+
+	object1 -> object2
+	object1 -> object3
+	object2 -> object4 [style="dotted"]
+	object3 -> object4 [style="dashed"]
+}

data/test/test_dot_helper.rb

@@ -5,46 +5,6 @@ class TestDotHelper < Minitest::Test
     DotHelper.new contents
   end
 
-  def test_extract_id_class_with_id
-    assert_equal ["x1"], dot_helper.extract_id_class("x1")
-  end
-
-  def test_extract_id_class_with_class_eq
-    assert_equal ["", "x1"], dot_helper.extract_id_class("class=x1")
-  end
-
-  def test_extract_id_class_with_id_class_eq
-    assert_equal ["x1", "c1"], dot_helper.extract_id_class("x1 class=c1")
-  end
-
-  def test_extract_id_class_with_id_class_eq_quote
-    assert_equal ["x1", "c1"], dot_helper.extract_id_class("x1 class='c1'")
-  end
-
-  def test_extract_id_class_with_id_class_eq_dbl_quote
-    assert_equal ["x1", "c1"], dot_helper.extract_id_class('x1 class="c1"')
-  end
-
-  def test_merge_id_class_with_id_class_eq_and_class
-    assert_equal ["x1", "c0 c1"], dot_helper.merge_id_class('x1 class="c1"', "c0")
-  end
-
-  def test_merge_id_class_with_id_multi_class_eq_and_class
-    assert_equal ["x1", "c0 c1 c2"], dot_helper.merge_id_class('x1 class="c1 c2"', "c0")
-  end
-
-  def test_fix_node_id_with_id_class_eq_and_class
-    node = dot_helper.fix_node_id(dom(%{<x><div id="x1 class=c1"></div></x>}, "div"))
-    assert_equal "x1", node["id"]
-    assert_equal "c1", node["class"]
-  end
-
-  def test_fix_ids
-    node = dot_helper(%{<x><div id="x1 class=c1" class="c0"></div></x>}).fix_ids.dom
-    assert_equal "x1", node.at("div")["id"]
-    assert_equal "c0 c1", node.at("div")["class"]
-  end
-
   private
 
   def dom(contents, at=nil)

metadata

@@ -1,15 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: dothtml
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Keenan Brock
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2015-03-11 00:00:00.000000000 Z
+date: 2016-02-09 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: trollop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
@@ -25,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard-rake
+  name: guard-shell
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: guard-livereload
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -108,7 +150,13 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Make conversion of dot to html easier
+description: |2
+                            In a world, full of html, and javascript,
+                            there can exist only one graphing library.
+                            But there still is hope in trusty graphviz.
+
+                            This makes the conversion of dot to html
+                            and d3js easier.
 email:
 - keenan@thebrocks.net
 executables:
@@ -123,18 +171,18 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/dothtml
 - dothtml.gemspec
+- exe/dothtml
 - lib/dothtml.rb
+- lib/dothtml/cli.rb
 - lib/dothtml/dot_helper.rb
 - lib/dothtml/dot_task.rb
 - lib/dothtml/version.rb
-- templates/Gemfile
 - templates/Guardfile
-- templates/Rakefile
 - templates/behavior.js
 - templates/d3.v3.js
 - templates/index.html.erb
+- templates/sample.dot
 - templates/style.css
 - test/minitest_helper.rb
 - test/test_dot_helper.rb
@@ -160,7 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Make conversion of dot to html easier

data/bin/dothtml

@@ -1,3 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'dothtml'

data/templates/Gemfile

@@ -1,5 +0,0 @@
-source 'https://rubygems.org'
-
-group "diagram" do
-  gem 'dothtml'
-end

data/templates/Rakefile

@@ -1,23 +0,0 @@
-
-# Rakefile to build dot files
-# dependencies:
-# mac 
-# graphviz to convert dot files to svg
-
-require "dothtml/dot_task"
-
-Dothtml::DotTask.new do |t|
-  #t.cdn      = true
-  #t.template = 'index.html.liquid'
-  #t.style    = 'style.css'
-  #t.behavior = 'behavior.js'
-end
-
-task :default => :html
-
-#task :html => %w(file1.html file2.html)
-task :html do
-  Dir.glob("*.dot").each do |f|
-    Rake::Task[f.sub(/\.dot$/, '.html')].invoke
-  end
-end