skippy 0.1.1.a → 0.2.0.a

data/app/commands/template.rb

@@ -8,18 +8,18 @@ class Template < Skippy::Command
       say '  No templates found'
     else
       templates.each { |template|
-        say "  #{template}", :green
+        say "  #{template.basename}", :green
       }
     end
   end
   default_command(:list)
 
-  desc 'install', 'Install a new template'
+  desc 'install SOURCE', 'Install a new template'
   def install(source)
     raise Skippy::Error, 'Not implemented'
   end
 
-  desc 'remove', 'Remove an installed template'
+  desc 'remove TEMPLATE', 'Remove an installed template'
   def remove(template_name)
     raise Skippy::Error, 'Not implemented'
   end

data/app/resources/commands/example.rb

@@ -7,7 +7,7 @@ class Hello < Skippy::Command
   default_command(:world)
 
   desc 'universe', 'Greets the universe in general'
-  def universe(person)
+  def universe
     say "DARK IN HERE, ISN'T IT?"
   end
 

data/app/templates/standard/%ext_name%.rb.tt

@@ -31,7 +31,7 @@ require 'sketchup.rb'
   EXTENSION = ::JSON.parse(extension_json, symbolize_names: true).freeze
 
   unless file_loaded?(__FILE__)
-    loader = File.join(PATH, 'bootstrap')
+    loader = File.join(PATH, 'main')
     @extension = SketchupExtension.new(EXTENSION[:name], loader)
     @extension.description = EXTENSION[:description]
     @extension.version     = EXTENSION[:version]

data/app/templates/webdialog/{extension.rb.erb → %ext_name%.rb.tt}

@@ -31,7 +31,7 @@ require 'sketchup.rb'
   EXTENSION = ::JSON.parse(extension_json, symbolize_names: true).freeze
 
   unless file_loaded?(__FILE__)
-    loader = File.join(PATH, 'bootstrap')
+    loader = File.join(PATH, 'main')
     @extension = SketchupExtension.new(EXTENSION[:name], loader)
     @extension.description = EXTENSION[:description]
     @extension.version     = EXTENSION[:version]

data/bin/aruba

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+#
+# This file was generated by Bundler.
+#
+# The application 'aruba' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("aruba", "aruba")

data/bin/cucumber

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+#
+# This file was generated by Bundler.
+#
+# The application 'cucumber' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("cucumber", "cucumber")

data/bin/htmldiff

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+#
+# This file was generated by Bundler.
+#
+# The application 'htmldiff' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("diff-lcs", "htmldiff")

data/bin/ldiff

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+#
+# This file was generated by Bundler.
+#
+# The application 'ldiff' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("diff-lcs", "ldiff")

data/cSpell.json

@@ -0,0 +1,18 @@
+// cSpell Settings
+{
+    // Version of the setting file.  Always 0.1
+    "version": "0.1",
+    // language - current active spelling language
+    "language": "en",
+    // words - list of words to be always considered correct
+    "words": [
+        "namespace",
+        "yieldparam"
+    ],
+    // flagWords - list of words to be always considered incorrect
+    // This is useful for offensive words and common spelling errors.
+    // For example "hte" should be "the"
+    "flagWords": [
+        "hte"
+    ]
+}

data/fixtures/my_lib/skippy.json

@@ -0,0 +1,5 @@
+{
+  "library": true,
+  "name": "My Shiny Library",
+  "version": "1.2.3"
+}

data/fixtures/my_lib/src/command.rb

@@ -0,0 +1,4 @@
+module SkippyLib
+  class Command
+  end
+end # module

data/fixtures/my_lib/src/geometry.rb

@@ -0,0 +1,4 @@
+module SkippyLib
+  class Geometry
+  end
+end # module

data/fixtures/my_lib/src/tool.rb

@@ -0,0 +1,4 @@
+module SkippyLib
+  class Tool
+  end
+end # module

data/fixtures/my_project/skippy.json

@@ -0,0 +1,8 @@
+{
+  "name": "Hello World",
+  "description": "",
+  "namespace": "Example::HelloWorld",
+  "author": "Unknown",
+  "copyright": "Copyright (c) 2017",
+  "license": "None"
+}

data/fixtures/my_project/skippy/commands/example.rb

@@ -0,0 +1,14 @@
+class Hello < Skippy::Command
+
+  desc 'world PERSON', 'Oh, hi there!'
+  def world(person)
+    say "Hello #{person}"
+  end
+  default_command(:world)
+
+  desc 'universe', 'Greets the universe in general'
+  def universe
+    say "DARK IN HERE, ISN'T IT?"
+  end
+
+end

data/fixtures/my_project/src/hello_world.rb

@@ -0,0 +1,47 @@
+#-------------------------------------------------------------------------------
+#
+#    Author: Unknown
+# Copyright: Copyright (c) 2017
+#   License: None
+#
+#-------------------------------------------------------------------------------
+
+require 'json'
+
+require 'extensions.rb'
+require 'sketchup.rb'
+
+module Example
+module HelloWorld
+
+  file = __FILE__.dup
+  # Account for Ruby encoding bug under Windows.
+  file.force_encoding('UTF-8') if file.respond_to?(:force_encoding)
+  # Support folder should be named the same as the root .rb file.
+  folder_name = File.basename(file, '.*')
+
+  # Path to the root .rb file (this file).
+  PATH_ROOT = File.dirname(file).freeze
+
+  # Path to the support folder.
+  PATH = File.join(PATH_ROOT, folder_name).freeze
+
+  # Extension information.
+  extension_json_file = File.join(PATH, 'extension.json')
+  extension_json = File.read(extension_json_file)
+  EXTENSION = ::JSON.parse(extension_json, symbolize_names: true).freeze
+
+  unless file_loaded?(__FILE__)
+    loader = File.join(PATH, 'main')
+    @extension = SketchupExtension.new(EXTENSION[:name], loader)
+    @extension.description = EXTENSION[:description]
+    @extension.version     = EXTENSION[:version]
+    @extension.copyright   = EXTENSION[:copyright]
+    @extension.creator     = EXTENSION[:creator]
+    Sketchup.register_extension(@extension, true)
+  end
+
+end # module HelloWorld
+end # module Example
+
+file_loaded(__FILE__)

data/fixtures/my_project/src/hello_world/extension.json

@@ -0,0 +1,10 @@
+{
+  "name": "Hello World",
+  "description": "",
+  "creator": "Unknown",
+  "copyright": "Copyright (c) 2017",
+  "license": "None",
+  "product_id": "Example_HelloWorld",
+  "version": "0.1.0",
+  "build": "1"
+}

data/fixtures/my_project/src/hello_world/main.rb

@@ -0,0 +1,21 @@
+require 'sketchup.rb'
+
+module Example::HelloWorld
+
+  unless file_loaded?(__FILE__)
+    menu = UI.menu('Plugins').add_submenu(EXTENSION[:name])
+    menu.add_item('Make Magic') { self.make_magic }
+    menu.add_separator
+    menu.add_item('Help...') { self.open_help }
+    file_loaded(__FILE__)
+  end
+
+  def self.make_magic
+    # Do magic here...
+  end
+
+  def self.open_help
+    UI.openURL(EXTENSION[:url])
+  end
+
+end # module

data/lib/skippy.rb

@@ -1,5 +1,9 @@
-require "skippy/version"
+require 'skippy/version'
 
 module Skippy
-  # Your code goes here...
-end
+
+  class << self
+    attr_accessor :app
+  end
+
+end # module

data/lib/skippy/app.rb

@@ -1,8 +1,8 @@
 require 'pathname'
 
+require 'skippy'
 require 'skippy/command'
 require 'skippy/group'
-require 'skippy/skippy'
 
 class Skippy::App
 
@@ -11,6 +11,7 @@ class Skippy::App
   def self.boot(boot_loader_path)
     Skippy.app = Skippy::App.new(boot_loader_path)
     Skippy.app.boot
+    Skippy.app
   end
 
   attr_reader :path
@@ -35,27 +36,28 @@ class Skippy::App
     Pathname.new(File.join(path, 'templates'))
   end
 
+  # @return [Array<Pathname>]
   def templates
     result = []
     templates_source_path.entries.each { |entry|
       template_path =  templates_source_path.join(entry)
       next unless template_path.directory?
-      next if %[. ..].include?(entry.basename.to_s)
-      result << entry
+      next if %w[. ..].include?(entry.basename.to_s)
+      result << entry.expand_path(templates_source_path)
     }
     result
   end
 
   private
 
-  # @return [Array<String>] loaded files
   def boot_commands
     # Load the default skippy commands.
     path_commands = File.join(path, 'commands')
     commands_pattern = File.join(path_commands, '*.rb')
     Dir.glob(commands_pattern) { |filename|
+      # noinspection RubyResolve
       require filename
     }
   end
 
-end
+end

data/lib/skippy/cli.rb

@@ -31,11 +31,11 @@ class Skippy::CLI < Skippy::Command
 
   end # Class methods
 
-  map "-v" => :version
+  map '-v' => :version
 
   default_command :list
 
-  desc "version", "Show Skippy version"
+  desc 'version', 'Show Skippy version'
   def version
     display_app_banner
   end
@@ -48,7 +48,7 @@ class Skippy::CLI < Skippy::Command
       initialize_thorfiles(meth)
       klass, command = Thor::Util.find_class_and_command_by_namespace(meth)
       self.class.handle_no_command_error(command, false) if klass.nil?
-      klass.start(["-h", command].compact, :shell => shell)
+      klass.start(['-h', command].compact, :shell => shell)
     else
       super
     end
@@ -68,14 +68,14 @@ class Skippy::CLI < Skippy::Command
   end
 
   # Verbatim copy from Thor::Runner:
-  desc "list [SEARCH]", "List the available #{$PROGRAM_NAME} commands (--substring means .*SEARCH)"
+  desc 'list [SEARCH]', "List the available #{$PROGRAM_NAME} commands (--substring means .*SEARCH)"
   method_options :substring => :boolean, :group => :string, :all => :boolean, :debug => :boolean
-  def list(search = "")
+  def list(search = '')
     initialize_thorfiles
 
-    search = ".*#{search}" if options["substring"]
+    search = ".*#{search}" if options['substring']
     search = /^#{search}.*/i
-    group  = options[:group] || "standard"
+    group  = options[:group] || 'standard'
 
     klasses = Thor::Base.subclasses.select do |k|
       (options[:all] || k.group == group) && k.namespace =~ search
@@ -120,7 +120,7 @@ class Skippy::CLI < Skippy::Command
   end
 
   # Based on Thor::Runner:
-  def display_klasses(with_modules = false, show_internal = false, klasses = Thor::Base.subclasses)
+  def display_klasses(_with_modules = false, show_internal = false, klasses = Thor::Base.subclasses)
     unless show_internal
       klasses -= [
         Thor, Thor::Runner, Thor::Group,
@@ -135,7 +135,7 @@ class Skippy::CLI < Skippy::Command
 
     # Get classes which inherit from Thor
     (klasses - groups).each { |k|
-      list[k.namespace.split(":").first] += k.printable_commands(false)
+      list[k.namespace.split(':').first] += k.printable_commands(false)
     }
 
     # Get classes which inherit from Thor::Base
@@ -156,7 +156,7 @@ class Skippy::CLI < Skippy::Command
 
     # Order namespaces with default coming first
     list = list.sort { |a, b|
-      a[0].sub(/^default/, "") <=> b[0].sub(/^default/, "")
+      a[0].sub(/^default/, '') <=> b[0].sub(/^default/, '')
     }
     list.each { |n, commands|
       display_commands(n, commands, col_width) unless commands.empty?
@@ -189,10 +189,10 @@ class Skippy::CLI < Skippy::Command
     labels = %w[Modules Namespaces]
 
     info << labels
-    info << ["-" * labels[0].size, "-" * labels[1].size]
+    info << ['-' * labels[0].size, '-' * labels[1].size]
 
     print_table info
-    say ""
+    say ''
   end
 
 end

data/lib/skippy/config.rb

@@ -0,0 +1,135 @@
+require 'json'
+require 'pathname'
+
+require 'skippy/error'
+
+class Skippy::Config < Hash
+
+  attr_accessor :path
+
+  class MissingPathError < Skippy::Error; end
+
+  def self.load(path, defaults = {})
+    if path.exist?
+      json = File.read(path)
+      config = JSON.parse(json,
+        symbolize_names: true,
+        object_class: self
+      )
+    else
+      config = self.new
+    end
+    # Need to merge nested defaults.
+    config.merge!(defaults) { |_key, value, default|
+      if value.is_a?(Hash) && default.is_a?(Hash)
+        # Deep merge in order to merge nested hashes.
+        # Note: This currently doesn't merge arrays.
+        # http://stackoverflow.com/a/9381776/486990
+        merger = proc { |_k, v1, v2|
+          Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : v2
+        }
+        default.merge(value, &merger)
+      else
+        value || default
+      end
+    }
+    config.path = path
+    config
+  end
+
+  def get(key_path, default = nil)
+    get_item(key_path) || default
+  end
+
+  def set(key_path, value)
+    set_item(key_path, value)
+  end
+
+  def push(key_path, value)
+    item = get_item(key_path)
+    item = set_item(key_path, []) if item.nil?
+    raise ArgumentError, 'key path is not an Array' unless item.is_a?(Array)
+    item << value
+  end
+
+  def export(target_path)
+    json = JSON.pretty_generate(self)
+    File.write(target_path, json)
+    nil
+  end
+
+  def save_as(target_path)
+    export(target_path)
+    @path = target_path
+    nil
+  end
+
+  def save
+    raise MissingPathError if path.nil?
+    export(path)
+  end
+
+  def path=(new_path)
+    @path = Pathname.new(new_path)
+  end
+
+  def update(hash)
+    if hash.keys.first.is_a?(String)
+      update_from_key_paths(hash)
+    else
+      update_from_hash(hash)
+    end
+    self
+  end
+
+  def inspect
+    "#{super}:#{self.class.name}"
+  end
+
+  private
+
+  def update_from_hash(hash)
+    merger = proc { |_key, v1, v2|
+      Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : v2
+    }
+    merge!(hash, &merger)
+  end
+
+  def update_from_key_paths(key_paths)
+    key_paths.each { |key_path, value|
+      set(key_path, value)
+    }
+  end
+
+  def key_parts(key_path)
+    if key_path.is_a?(Symbol)
+      [key_path]
+    else
+      key_path.split('/').map { |key| key.intern }
+    end
+  end
+
+  def get_item(key_path)
+    parts = key_parts(key_path)
+    return nil if parts.empty?
+    item = self
+    parts.each { |key|
+      return nil if item.nil?
+      item = item[key]
+    }
+    item
+  end
+
+  def set_item(key_path, value)
+    item = self
+    parts = key_parts(key_path)
+    last_key = parts.pop
+    parts.each { |key|
+      item[key] ||= self.class.new
+      item = item[key]
+    }
+    item[last_key] = value
+    value
+  end
+
+end