shoes-core 4.0.0.pre9 → 4.0.0.pre10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4ba64133e02f0c5a97f98f1f9eff7a68b32fba38
-  data.tar.gz: c3ee4b52936eb0125cf87f8c21b318ada8ca949f
+SHA256:
+  metadata.gz: f9dde3be80d20738ebbc4be46c36877fbf22b937220502390e1535dfe2b78073
+  data.tar.gz: e870b37ec97751911c6a2ca0aa793ef78b2a903ef57e36c6dc7e9cb3751cb2b8
 SHA512:
-  metadata.gz: 399a8a7dc9fe4057095a926b7fb9a41c442a5bfb96295a6b21122dab8f829968f34841a94e4b836be4927bd197582ef544e0c768383dc57152f46ff38f214e76
-  data.tar.gz: 161b478d23e6949f3c5ce41fd7178c7f75ed3ef6da3a52b1e9f57f6daddfa61d86a3dcdeb2aa9a927b5eae167ea098a7eb880a1d841d41f0019c196bb7eaa5d9
+  metadata.gz: 547f206603c5e78dab96fc40b6a8b95f0b884484bf01378cec2625a92700b2f69c35a8a6b97343eb70941569fc531bf134018e7021b16841b509ead5cff42ae9
+  data.tar.gz: 8d18cfe318b66e676a6d592da37ab007b4544df7c4972b99c4e83ef338822296039a48245ac76e210ccd8e7f2be1d369acb66efad677e2a9d427c7a352820227

data/lib/shoes/app.rb

@@ -45,6 +45,7 @@ class Shoes
     #
     # @see Dimension#initialize
     def initialize(opts = {}, &blk)
+      ensure_app_dir_set
       @__app__ = Shoes::InternalApp.new(self, opts, &blk)
       @__app__.setup_gui
       Shoes.register self
@@ -105,6 +106,15 @@ class Shoes
 
     private
 
+    # If we didn't arrive by any of our executables (shoes or packaging)
+    # treat the starting directory in our call tree as the app directory.
+    def ensure_app_dir_set
+      return if Shoes.configuration.app_dir
+
+      path, *_ = caller.last.split(":")
+      Shoes.configuration.app_dir = File.dirname(path)
+    end
+
     def inspect_details
       " \"#{@__app__.app_title}\""
     end

data/lib/shoes/color/dsl_helpers.rb

@@ -2,6 +2,8 @@
 class Shoes
   class Color
     module DSLHelpers
+      include Common::ImageHandling
+
       def pattern(*args)
         if args.length == 1
           arg = args.first
@@ -81,7 +83,11 @@ class Shoes
       end
 
       def image_pattern(path)
+        path = absolute_file_path(path)
         Shoes::ImagePattern.new path if File.exist?(path)
+      rescue FileNotFoundError => e
+        Shoes.logger.error(e.message)
+        return nil
       end
     end
   end

data/lib/shoes/common/image_handling.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+class Shoes
+  module Common
+    module ImageHandling
+      def absolute_file_path(path)
+        if Pathname(path).absolute?
+          search_for(File.basename(path), File.dirname(path))
+        else
+          search_for(path, *default_search_paths)
+        end
+      end
+
+      def search_for(path, *locations)
+        found = locations.map { |dir| File.join(dir, path) }
+                         .find { |candidate| File.exist?(candidate) }
+
+        unless found
+          raise FileNotFoundError, "#{path} not found. Searched #{locations.join(',')}"
+        end
+
+        found
+      end
+
+      def default_search_paths
+        [Dir.pwd, Shoes.configuration.app_dir, File.join(Shoes::DIR, "static")]
+      end
+    end
+  end
+end

data/lib/shoes/configuration.rb

@@ -2,6 +2,7 @@
 class Shoes
   class Configuration
     class << self
+      attr_accessor :app_dir
       attr_writer :fail_fast
 
       def fail_fast

data/lib/shoes/core/version.rb

@@ -2,6 +2,6 @@
 
 class Shoes
   module Core
-    VERSION = "4.0.0.pre9"
+    VERSION = "4.0.0.pre10"
   end
 end

data/lib/shoes/dsl.rb

@@ -37,6 +37,7 @@ require 'shoes/core/version'
 require 'shoes/packager'
 
 require 'shoes/renamed_delegate'
+require 'shoes/common/image_handling'
 require 'shoes/common/inspect'
 require 'shoes/dimension'
 require 'shoes/dimensions'

data/lib/shoes/image.rb

@@ -3,6 +3,7 @@ class Shoes
   class Image < Common::UIElement
     include Common::Clickable
     include Common::Hover
+    include Common::ImageHandling
 
     BINARY_ENCODING = Encoding.find('binary')
 
@@ -38,11 +39,5 @@ class Shoes
       return path_or_data if url?(path_or_data)
       absolute_file_path(path_or_data)
     end
-
-    def absolute_file_path(path)
-      path = File.join(Dir.pwd, path) unless Pathname(path).absolute?
-      raise FileNotFoundError, "#{path} not found." unless File.exist?(path)
-      path
-    end
   end
 end

data/lib/shoes/mock.rb

@@ -1,4 +1,12 @@
 # frozen_string_literal: true
+
+class Shoes
+  module Mock
+    def self.initialize_backend(*_)
+    end
+  end
+end
+
 require 'shoes/mock/common_methods'
 require 'shoes/mock/clickable'
 

data/lib/shoes/mock/packager.rb

@@ -4,12 +4,14 @@ class Shoes
     class Packager
       attr_accessor :gems
 
-      def initialize(_dsl)
-        @packages = []
+      def initialize(*_)
       end
 
-      def create_package(_, package)
-        @packages << package
+      def options
+        OptionParser.new
+      end
+
+      def create_package(*_)
       end
     end
   end

data/lib/shoes/packager.rb

@@ -1,24 +1,21 @@
 # frozen_string_literal: true
 class Shoes
   class Packager
-    attr_reader :packages, :backend
+    attr_reader :backend
 
     def initialize
-      begin
-        @backend = Shoes.backend_for(self)
-        configure_gems
-      rescue ArgumentError
-        # Packaging unsupported by this backend
-      end
-      @packages = []
+      @backend = Shoes.backend_for(self)
+      configure_gems
+    rescue ArgumentError
+      # Packaging unsupported by this backend
     end
 
-    def create_package(program_name, package)
-      @packages << @backend.create_package(program_name, package)
+    def options
+      @backend.options
     end
 
-    def should_package?
-      @packages.any?
+    def parse!(args)
+      options.parse!(args)
     end
 
     def run(path)
@@ -36,10 +33,5 @@ class Shoes
     rescue => e
       Shoes.logger.error "Looking up gems for packaging failed:\n#{e.message}"
     end
-
-    def help(program_name)
-      return "" if @backend.nil?
-      @backend.help(program_name)
-    end
   end
 end

data/lib/shoes/ui/cli.rb

@@ -2,79 +2,44 @@
 require 'optparse'
 require 'shoes'
 
-class Shoes
-  class CLI
-    attr_reader :packager
-
-    def initialize(backend)
-      $LOAD_PATH.unshift(Dir.pwd)
-      backend_const = Shoes.load_backend(backend)
-      backend_const.initialize_backend
-
-      @packager = Shoes::Packager.new
-    end
-
-    def parse!(args)
-      options = OptionParser.new do |opts|
-        opts.program_name = 'shoes'
-        opts.banner = <<-EOS
-Usage: #{opts.program_name} [-h] [-p package] file
-        EOS
-        opts.separator ''
-        opts.separator 'Options:'
-
-        opts.on('-p', '--package PACKAGE_TYPE', 'Package as BACKEND:PACKAGE') do |package|
-          @packager.create_package(opts.program_name, package)
-        end
-
-        opts.on('-v', '--version', 'Shoes version') do
-          puts "Shoes #{Shoes::Core::VERSION}"
-          exit
-        end
-
-        opts.on('-m', '--manual', 'Run the Shoes manual') do
-          require 'shoes/manual'
-          Shoes::Manual.run "English"
-          exit
-        end
-
-        opts.on('-b', '--backend [BACKEND]', 'Select a Shoes backend') do |backend|
-          require 'shoes/ui/picker'
-          Shoes::UI::Picker.new.run(ENV["SHOES_BIN_DIR"], backend)
-          exit
-        end
-
-        opts.on('-f', '--fail-fast', 'Crash on exceptions in Shoes code') do
-          Shoes.configuration.fail_fast = true
-        end
+require 'shoes/ui/cli/base_command'
+require 'shoes/ui/cli/default_command'
+require 'shoes/ui/cli/help_command'
+require 'shoes/ui/cli/manual_command'
+require 'shoes/ui/cli/package_command'
+require 'shoes/ui/cli/select_backend_command'
+require 'shoes/ui/cli/version_command'
 
-        opts.separator @packager.help(opts.program_name)
+class Shoes
+  module UI
+    class CLI
+      SUPPORTED_COMMANDS = {
+        help:           HelpCommand,
+        manual:         ManualCommand,
+        package:        PackageCommand,
+        select_backend: SelectBackendCommand,
+        version:        VersionCommand,
+      }.freeze
+
+      def initialize(backend)
+        $LOAD_PATH.unshift(Dir.pwd)
+        backend_const = Shoes.load_backend(backend)
+        backend_const.initialize_backend
       end
 
-      options.parse!(args)
-      options
-    end
-
-    # Execute a shoes app.
-    #
-    # @param [String] app the location of the app to run
-    # @param [String] backend name of backend to load with the app
-    def execute_app(app)
-      load app
-    end
+      def run(args)
+        if args.empty?
+          Shoes::UI::CLI::HelpCommand.new([]).run
+          exit(1)
+        end
 
-    def run(args)
-      opts = parse!(args)
-      if args.empty?
-        puts opts.banner
-        puts "Try '#{opts.program_name} --help' for more information"
-        exit(0)
+        command = create_command(*args)
+        command.run
       end
 
-      if @packager.should_package?
-        @packager.run(args.shift)
-      else
-        execute_app(args.first)
+      def create_command(*args)
+        command_class = SUPPORTED_COMMANDS[args.first.to_sym] || DefaultCommand
+        command_class.new(args.dup)
       end
     end
   end

data/lib/shoes/ui/cli/base_command.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+class Shoes
+  module UI
+    class CLI
+      class BaseCommand
+        attr_reader :args
+
+        def initialize(args)
+          @args = args
+        end
+
+        def warn_on_unexpected_parameters(expected_size = 1)
+          return unless args.size > expected_size
+
+          unexpected = args[expected_size..-1].join(" ")
+          Shoes.logger.warn("Unexpected extra parameters '#{unexpected}'")
+        end
+
+        def self.help
+          nil
+        end
+
+        def self.help_from_options(command, options)
+          lines = ["#{command}\n"] + options.summarize
+          lines.join("")
+        end
+      end
+    end
+  end
+end

data/lib/shoes/ui/cli/default_command.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+class Shoes
+  module UI
+    class CLI
+      class DefaultCommand < BaseCommand
+        def run
+          if parse!(args)
+            warn_on_unexpected_parameters
+
+            path = args.first
+            if path
+              $LOAD_PATH.unshift(File.dirname(path))
+              Shoes.configuration.app_dir = File.dirname(path)
+              load path
+            end
+          end
+        end
+
+        def parse!(args)
+          self.class.options.parse!(args)
+          true
+        rescue OptionParser::InvalidOption => e
+          puts "Whoops! #{e.message}"
+          puts
+          puts self.class.help
+
+          false
+        end
+
+        def self.options
+          OptionParser.new do |opts|
+            # Keep around command dashed options
+            opts.on('-v', '--version', 'Shoes version') do
+              Shoes::UI::CLI::VersionCommand.new([]).run
+              exit
+            end
+
+            opts.on('-h', '--help', 'Shoes help') do
+              Shoes::UI::CLI::HelpCommand.new([]).run
+              exit
+            end
+
+            # Also, we have some real runtime options!
+            opts.on('-f', '--fail-fast', 'Crash on exceptions in Shoes code') do
+              Shoes.configuration.fail_fast = true
+            end
+          end
+        end
+
+        def self.help
+          help_from_options("shoes [options] file", options)
+        end
+      end
+    end
+  end
+end

data/lib/shoes/ui/cli/help_command.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+class Shoes
+  module UI
+    class CLI
+      class HelpCommand < BaseCommand
+        def run
+          warn_on_unexpected_parameters
+
+          puts "Shoes is the best little GUI toolkit for Ruby."
+          puts
+
+          command_classes = [DefaultCommand]
+          command_classes.concat(SUPPORTED_COMMANDS.map(&:last))
+
+          command_classes.each do |command_class|
+            text = command_class.help.to_s
+            unless text.empty?
+              puts text
+              puts
+            end
+          end
+        end
+
+        def self.help
+          <<-EOS
+shoes help
+    Displays this help text
+EOS
+        end
+      end
+    end
+  end
+end

data/lib/shoes/ui/cli/manual_command.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+class Shoes
+  module UI
+    class CLI
+      class ManualCommand < BaseCommand
+        def run
+          require 'shoes/manual'
+          Shoes::Manual.run "English"
+        end
+
+        def self.help
+          <<-EOS
+shoes manual
+    Run the interactive Shoes manual
+EOS
+        end
+      end
+    end
+  end
+end

data/lib/shoes/ui/cli/package_command.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+class Shoes
+  module UI
+    class CLI
+      class PackageCommand < BaseCommand
+        def run
+          @packager = Shoes::Packager.new
+          @packager.parse!(args)
+
+          warn_on_unexpected_parameters(2)
+
+          path = args[1]
+          @packager.run(path)
+        rescue OptionParser::InvalidOption => e
+          puts "Whoops! #{e.message}"
+          puts
+          puts self.class.help
+
+          false
+        end
+
+        def self.help
+          help_from_options("shoes package [options] file",
+                            Shoes::Packager.new.options) + <<-EOS
+
+    Packages may be built either from a single .rb file, or a .yaml file with
+    more options defined.
+EOS
+        end
+      end
+    end
+  end
+end

data/lib/shoes/ui/cli/select_backend_command.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+class Shoes
+  module UI
+    class CLI
+      class SelectBackendCommand < BaseCommand
+        def run
+          require 'shoes/ui/picker'
+          backend = args[1]
+          Shoes::UI::Picker.new.run(ENV["SHOES_BIN_DIR"], backend)
+        end
+
+        def self.help
+          <<-EOS
+shoes select_backend [backend]
+    Select a Shoes backend to use. A backend can be specified, or Shoes will
+    attempt to auto-detect available backends to select from.
+EOS
+        end
+      end
+    end
+  end
+end

data/lib/shoes/ui/cli/version_command.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+class Shoes
+  module UI
+    class CLI
+      class VersionCommand < BaseCommand
+        def run
+          puts "Shoes #{Shoes::Core::VERSION}"
+        end
+
+        def self.help
+          <<-EOS
+shoes version
+    Prints the current Shoes version
+EOS
+        end
+      end
+    end
+  end
+end

data/lib/shoes/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class Shoes
-  VERSION = "4.0.0.pre9"
+  VERSION = "4.0.0.pre10"
 end

metadata

@@ -1,16 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: shoes-core
 version: !ruby/object:Gem::Version
-  version: 4.0.0.pre9
+  version: 4.0.0.pre10
 platform: ruby
 authors:
 - Team Shoes
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-03-24 00:00:00.000000000 Z
+date: 2017-06-17 00:00:00.000000000 Z
 dependencies: []
-description: Shoes is the best little GUI toolkit for Ruby. Shoes makes building for Mac, Windows, and Linux super simple. This is the DSL for writing your app. You'll need a backend to run it.
+description: Shoes is the best little GUI toolkit for Ruby. Shoes makes building for
+  Mac, Windows, and Linux super simple. This is the DSL for writing your app. You'll
+  need a backend to run it.
 email:
 - shoes@lists.mvmanila.com
 executables:
@@ -44,6 +46,7 @@ files:
 - lib/shoes/common/clickable.rb
 - lib/shoes/common/fill.rb
 - lib/shoes/common/hover.rb
+- lib/shoes/common/image_handling.rb
 - lib/shoes/common/inspect.rb
 - lib/shoes/common/link_finder.rb
 - lib/shoes/common/positioning.rb
@@ -141,6 +144,13 @@ files:
 - lib/shoes/text_block_dimensions.rb
 - lib/shoes/timer.rb
 - lib/shoes/ui/cli.rb
+- lib/shoes/ui/cli/base_command.rb
+- lib/shoes/ui/cli/default_command.rb
+- lib/shoes/ui/cli/help_command.rb
+- lib/shoes/ui/cli/manual_command.rb
+- lib/shoes/ui/cli/package_command.rb
+- lib/shoes/ui/cli/select_backend_command.rb
+- lib/shoes/ui/cli/version_command.rb
 - lib/shoes/ui/picker.rb
 - lib/shoes/url.rb
 - lib/shoes/version.rb
@@ -170,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project:
-rubygems_version: 2.6.10
+rubygems_version: 2.6.11
 signing_key:
 specification_version: 4
 summary: The best little DSL for the best little GUI toolkit for Ruby.