skippy 0.2.0.a → 0.3.0.a

data/app/commands/new.rb

@@ -9,13 +9,25 @@ class New < Skippy::Command::Group
   include Thor::Actions
 
   argument :namespace,
-    :type => :string,
-    :desc => 'The namespace the extension will use'
+    type: :string,
+    desc: 'The namespace the extension will use'
+
+  class_option :basename,
+    aliases: ['-b'],
+    type: :string,
+    desc: 'The basename for the extension filename'
+
+  class_option :downcase,
+    aliases: ['-d'],
+    type: :boolean,
+    desc: 'Downcase the generated basename for the extension filename',
+    default: false
 
   class_option :template,
-    :type => :string,
-    :desc => 'The template used to generate the project files',
-    :default => 'standard'
+    aliases: ['-t'],
+    type: :string,
+    desc: 'The template used to generate the project files',
+    default: 'standard'
 
   source_paths << Skippy.app.resources
 
@@ -28,6 +40,8 @@ class New < Skippy::Command::Group
     end
     project.namespace = namespace
     project.name = project.namespace.to_name
+    project.basename = options[:basename] || project.namespace.short_name
+    project.basename = project.basename.downcase if options[:downcase]
   end
 
   def validate_template
@@ -60,12 +74,12 @@ class New < Skippy::Command::Group
       creator: project.author,
       copyright: project.copyright,
       license: project.license,
-      product_id: project.namespace.to_a.join('_'),
+      product_id: project.namespace.short_name,
       version: '0.1.0',
       build: '1',
     }
     json = JSON.pretty_generate(extension_info)
-    json_filename = "src/#{project.namespace.to_underscore}/extension.json"
+    json_filename = "src/#{ext_name}/extension.json"
     create_file(json_filename, json)
   end
 
@@ -84,7 +98,7 @@ class New < Skippy::Command::Group
 
     # @return [String] The basename for the extension files.
     def ext_name
-      project.namespace.to_underscore
+      project.basename
     end
 
   end # no_commands

data/app/commands/template.rb

@@ -15,12 +15,12 @@ class Template < Skippy::Command
   default_command(:list)
 
   desc 'install SOURCE', 'Install a new template'
-  def install(source)
+  def install(_source)
     raise Skippy::Error, 'Not implemented'
   end
 
   desc 'remove TEMPLATE', 'Remove an installed template'
-  def remove(template_name)
+  def remove(_template_name)
     raise Skippy::Error, 'Not implemented'
   end
 

data/bin/rubocop

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+#
+# This file was generated by Bundler.
+#
+# The application 'rubocop' 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("rubocop", "rubocop")

data/bin/ruby-parse

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+#
+# This file was generated by Bundler.
+#
+# The application 'ruby-parse' 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("parser", "ruby-parse")

data/bin/ruby-rewrite

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+#
+# This file was generated by Bundler.
+#
+# The application 'ruby-rewrite' 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("parser", "ruby-rewrite")

data/debug/skippy.bat

@@ -1,5 +1,7 @@
 @echo off
 REM This is used to be able to run Skippy directly from source.
+REM Add its location to the system PATH.
+REM
 REM %~dp0 returns the path for this batch file.
 REM http://stackoverflow.com/a/659672/486990
 REM

data/fixtures/my_lib/modules/gl.rb

@@ -0,0 +1,4 @@
+module SkippyLib
+  module GL
+  end
+end # module

data/fixtures/my_lib/modules/gl/container.rb

@@ -0,0 +1,8 @@
+require 'modules/gl/control'
+
+module SkippyLib
+  module GL
+    class Container < Control
+    end
+  end
+end # module

data/fixtures/my_lib/modules/gl/control.rb

@@ -0,0 +1,6 @@
+module SkippyLib
+  module GL
+    class Control
+    end
+  end
+end # module

data/fixtures/my_lib/modules/gl/nested/nested.rb

@@ -0,0 +1,8 @@
+require 'modules/gl/control'
+
+module SkippyLib
+  module GL
+    module Nested
+    end
+  end
+end # module

data/fixtures/my_lib/skippy.json

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

data/fixtures/my_project/skippy.json

@@ -2,7 +2,8 @@
   "name": "Hello World",
   "description": "",
   "namespace": "Example::HelloWorld",
+  "basename": "hello_world",
   "author": "Unknown",
   "copyright": "Copyright (c) 2017",
   "license": "None"
-}
+}

data/fixtures/my_project/src/hello_world.rb

@@ -11,7 +11,7 @@ require 'json'
 require 'extensions.rb'
 require 'sketchup.rb'
 
-module Example
+module Example
 module HelloWorld
 
   file = __FILE__.dup
@@ -41,7 +41,7 @@ module HelloWorld
     Sketchup.register_extension(@extension, true)
   end
 
-end # module HelloWorld
+end # module HelloWorld
 end # module Example
 
 file_loaded(__FILE__)

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

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

data/fixtures/project_with_lib/.skippy/libs/my-lib/modules/command.rb

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

data/fixtures/project_with_lib/.skippy/libs/my-lib/modules/gl.rb

@@ -0,0 +1,4 @@
+module SkippyLib
+  module GL
+  end
+end # module

data/fixtures/project_with_lib/.skippy/libs/my-lib/modules/gl/container.rb

@@ -0,0 +1,8 @@
+Sketchup.require 'modules/gl/control'
+
+module SkippyLib
+  module GL
+    class Container < Control
+    end
+  end
+end # module

data/fixtures/project_with_lib/.skippy/libs/my-lib/modules/gl/control.rb

@@ -0,0 +1,6 @@
+module SkippyLib
+  module GL
+    class Control
+    end
+  end
+end # module

data/fixtures/project_with_lib/.skippy/libs/my-lib/skippy.json

@@ -0,0 +1,5 @@
+{
+  "library": true,
+  "name": "my-lib",
+  "version": "1.2.3"
+}

data/fixtures/project_with_lib/.skippy/libs/my-other-lib/modules/something.rb

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

data/fixtures/project_with_lib/.skippy/libs/my-other-lib/skippy.json

@@ -0,0 +1,5 @@
+{
+  "library": true,
+  "name": "my-other-lib",
+  "version": "2.4.3"
+}

data/fixtures/project_with_lib/skippy.json

@@ -0,0 +1,25 @@
+{
+  "name": "Hello World",
+  "description": "",
+  "namespace": "Example::HelloWorld",
+  "basename": "hello_world",
+  "author": "Unknown",
+  "copyright": "Copyright (c) 2017",
+  "license": "None",
+  "libraries": [
+    {
+      "name": "my-lib",
+      "version": "1.2.3",
+      "source": "./temp/my_lib"
+    },
+    {
+      "name": "my-other-lib",
+      "version": "2.4.3",
+      "source": "./temp/my-other-lib"
+    }
+  ],
+  "modules": [
+    "my-lib/command",
+    "my-other-lib/something"
+  ]
+}

data/fixtures/project_with_lib/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/project_with_lib/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/project_with_lib/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/project_with_lib/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/fixtures/project_with_lib/src/hello_world/vendor/my-lib/command.rb

@@ -0,0 +1,4 @@
+module Example::HelloWorld
+  class Command
+  end
+end # module

data/fixtures/project_with_lib/src/hello_world/vendor/my-other-lib/something.rb

@@ -0,0 +1,4 @@
+module Example::HelloWorld
+  class Something
+  end
+end # module

data/lib/skippy.rb

@@ -3,7 +3,9 @@ require 'skippy/version'
 module Skippy
 
   class << self
+
     attr_accessor :app
+
   end
 
 end # module