shoes-core 4.0.0.pre4 → 4.0.0.pre5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84a2c73e863ae6a5e1d2c53484822830719a8e3e
-  data.tar.gz: e26555a20033558b5618a6be1821ce73ec0dbf1d
+  metadata.gz: a1ef269a6d0c75e333dd8592da3a015c91b94aed
+  data.tar.gz: 5f827551fdacff4074c2bb9050104c83e10ca5e8
 SHA512:
-  metadata.gz: 775fbfd5702df09c69a035c02502f1c8db234eef54aaa7f9e72fe46f6fac2af59c698e7d40f86bf9d61ec6dfbc6fd49b2d14fb643a8a473f86fb598aeeb227f0
-  data.tar.gz: b4568bcb40bcc3e4c3e67b63d90b9d70f85905aba5ed0450add252ee22da124b6c4d64e847f81245636ac8d2c5de4a70b5c28fb0c93cd35f43b89ad2f41b61d9
+  metadata.gz: 742d48be0d8c9b7f6d17e8c9d96dc93ed5db1c8076d3430ac1e91d9126d948b996f54ed422a7a2a81e8e646cf1d374484cb457dcd554a370691eee700786e2ff
+  data.tar.gz: 7388924d45215cb1ae721ef6feed84562c4dd3050c4a35a587f80442258b4579b5006b0e70c445f1a03761ce421a22c66ae770749cc14e7b02780d63226a6925

data/Guardfile

@@ -0,0 +1,5 @@
+guard 'rspec', cmd: 'rspec' do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})            { |m| "spec/#{m[1]}_spec.rb" }
+  watch(%r{^lib/shoes/mock/(.+)\.rb$}) { |m| "spec/shoes/#{m[1]}_spec.rb" }
+end

data/bin/shoes

@@ -42,7 +42,7 @@ mac_readlink_f () {
   echo $RESULT
 }
 
-case "${MACHTYPE:-}" in
+case "${MACHTYPE:-}${OSTYPE:-}" in
   (*darwin*)
     SCRIPT=$(mac_readlink_f $0);;
   (*)

data/bin/shoes-stub

@@ -42,7 +42,7 @@ mac_readlink_f () {
   echo $RESULT
 }
 
-case "${MACHTYPE:-}" in
+case "${MACHTYPE:-}${OSTYPE:-}" in
   (*darwin*)
     SCRIPT=$(mac_readlink_f $0);;
   (*)

data/ext/install/Rakefile

@@ -15,15 +15,25 @@ require 'fileutils'
 # We also provide a Rubygems plugin to clean up our manual file on uninstall.
 # Post-install hooks didn't seem to work, though, hence the extension trick.
 
-task :default => ['install_script']
+task default: ['install_script']
 
 task :install_script do
+  # If we're run via jruby-complete.jar, bindir is within the jar itself so
+  # look for bin based on user directory. Otherwise, prefer Gem.bindir.
+  if Gem.bindir.start_with?("uri:classloader")
+    dest_dir = Gem.bindir(Gem.user_dir)
+  else
+    dest_dir = Gem.bindir
+  end
+
   if Gem.win_platform?
-    source_path = File.join(File.dirname(__FILE__), "shoes.bat")
-    dest_path = File.join(Gem.bindir, "shoes.bat")
+    source_path = File.join(Dir.pwd, "shoes.bat")
+    dest_path = File.join(dest_dir, "shoes.bat")
   else
-    source_path = File.join(File.dirname(__FILE__), "..", "..", "bin", "shoes-stub")
-    dest_path = File.join(Gem.bindir, "shoes")
+    source_path = File.join(Dir.pwd, "..", "..", "bin", "shoes-stub")
+    dest_path = File.join(dest_dir, "shoes")
   end
+
+  FileUtils.mkdir_p(dest_dir)
   FileUtils.cp(source_path, dest_path)
 end

data/ext/install/shoes.bat

@@ -7,7 +7,7 @@ if not defined bin_dir set bin_dir=%~dp0
 if not exist !bin_dir!\shoes-backend (
   REM TODO: Can we get rid of jruby in some way here? My Windows box didn't
   REM have a global ruby installed by just installing jruby :(
-  jruby --1.9 !bin_dir!\shoes-picker !bin_dir!
+  jruby !bin_dir!\shoes-picker !bin_dir!
 )
 
 set shoes_bin_dir=!bin_dir!

data/lib/shoes/animation.rb

@@ -17,10 +17,10 @@ class Shoes
       @blk = @app.current_slot.create_bound_block(blk)
       @current_frame = 0
       @stopped = false
-      @gui = Shoes.configuration.backend_for(self, @app.gui)
+      @gui = Shoes.backend_for(self)
     end
 
-    attr_reader :current_frame, :framerate, :blk
+    attr_reader :current_frame, :framerate, :blk, :app
 
     def start
       @stopped = false

data/lib/shoes/arc.rb

@@ -5,6 +5,7 @@ class Shoes
     include Common::Stroke
     include Common::Style
     include Common::Clickable
+    include Common::Hover
 
     style_with :angle1, :angle2, :art_styles, :center, :common_styles, :dimensions, :radius, :wedge
     STYLES = { wedge: false }

data/lib/shoes/builtin_methods.rb

@@ -17,24 +17,11 @@ class Shoes
       Shoes::Dialog.new.confirm(message)
     end
 
-    def info(message = '')
-      Shoes::LOG << ['info', message]
-      Shoes.logger.info message
-    end
-
-    def debug(message = '')
-      Shoes::LOG << ['debug', message]
-      Shoes.logger.debug message
-    end
-
-    def warn(message = '')
-      Shoes::LOG << ['warn', message]
-      Shoes.logger.warn message
-    end
-
-    def error(message = '')
-      Shoes::LOG << ['error', message]
-      Shoes.logger.error message
+    %w(info debug warn error).each do |log_level|
+      define_method(log_level) do |message = ''|
+        Shoes::LOG << [log_level, message]
+        Shoes.logger.public_send(log_level, message)
+      end
     end
 
     alias_method :confirm?, :confirm

data/lib/shoes/button.rb

@@ -3,6 +3,7 @@ class Shoes
     include Common::UIElement
     include Common::Style
     include Common::Clickable
+    include Common::State
 
     style_with :click, :common_styles, :dimensions, :state, :text
 
@@ -13,10 +14,5 @@ class Shoes
     def focus
       @gui.focus
     end
-
-    def state=(value)
-      style(state: value)
-      @gui.enabled value.nil?
-    end
   end
 end

data/lib/shoes/check_button.rb

@@ -3,6 +3,7 @@ class Shoes
     include Common::UIElement
     include Common::Style
     include Common::Clickable
+    include Common::State
 
     def checked?
       @gui.checked?
@@ -16,11 +17,6 @@ class Shoes
     def focus
       @gui.focus
     end
-
-    def state=(value)
-      style(state: value)
-      @gui.enabled value.nil?
-    end
   end
 
   class Check < CheckButton

data/lib/shoes/color.rb

@@ -60,6 +60,7 @@ EOS
     end
 
     def <=>(other)
+      return nil unless other.is_a?(self.class)
       if same_base_color?(other)
         @alpha <=> other.alpha
       else
@@ -104,279 +105,9 @@ EOS
         -1
       end
     end
-
-
-    class HexConverter
-      def initialize(hex)
-        @hex = validate(hex) || fail(ArgumentError, "Bad hex color: #{hex}")
-        @red, @green, @blue = hex_to_rgb(pad_if_necessary @hex)
-      end
-
-      def to_rgb
-        [@red, @green, @blue]
-      end
-
-      private
-
-      def hex_to_rgb(hex)
-        hex.chars.each_slice(2).map { |a| a.join.to_i(16) }
-      end
-
-      def pad_if_necessary(hex)
-        return hex unless hex.length == 3
-        hex.chars.map { |c| "#{c}#{c}" }.join
-      end
-
-      # Returns a 3- or 6-char hex string for valid input, or nil
-      # for invalid input.
-      def validate(hex)
-        match = /^#?(([0-9a-f]{3}){1,2})$/i.match(hex)
-        match && match[1]
-      end
-    end
-
-    module DSLHelpers
-      def pattern(*args)
-        if args.length == 1
-          arg = args.first
-          case arg
-          when String
-            image_file?(arg) ? image_pattern(arg) : color(arg)
-          when Shoes::Color
-            color arg
-          when Range, Shoes::Gradient
-            gradient(arg)
-          when Shoes::ImagePattern
-            arg
-          else
-            fail ArgumentError, "Bad pattern: #{arg.inspect}"
-          end
-        else
-          gradient(*args)
-        end
-      end
-
-      def color(arg)
-        Shoes::Color.create(arg)
-      end
-
-      def rgb(red, green, blue, alpha = Shoes::Color::OPAQUE)
-        Shoes::Color.new(red, green, blue, alpha)
-      end
-
-      # Creates a new Shoes::Gradient
-      #
-      # @overload gradient(from, to)
-      #   @param [Shoes::Color] from the starting color
-      #   @param [Shoes::Color] to the ending color
-      #
-      # @overload gradient(from, to)
-      #   @param [String] from a hex string representing the starting color
-      #   @param [String] to a hex string representing the ending color
-      #
-      # @overload gradient(range)
-      #   @param [Range<Shoes::Color>] range min color to max color
-      #
-      # @overload gradient(range)
-      #   @param [Range<String>] range min color to max color
-      def gradient(*args)
-        case args.length
-        when 1
-          arg = args[0]
-          case arg
-          when Gradient
-            min, max = arg.color1, arg.color2
-          when Range
-            min, max = arg.first, arg.last
-          else
-            fail ArgumentError, "Can't make gradient out of #{arg.inspect}"
-          end
-        when 2
-          min, max = args[0], args[1]
-        else
-          fail ArgumentError, "Wrong number of arguments (#{args.length} for 1 or 2)"
-        end
-        Shoes::Gradient.new(color(min), color(max))
-      end
-
-      def gray(level = 128, alpha = Shoes::Color::OPAQUE)
-        Shoes::Color.new(level, level, level, alpha)
-      end
-
-      alias_method :grey, :gray
-
-      private
-
-      def image_file?(arg)
-        arg =~ /\.gif|jpg|jpeg|png$/
-      end
-
-      def image_pattern(path)
-        Shoes::ImagePattern.new path if File.exist?(path)
-      end
-    end
-  end
-
-  # Create all of the built-in Shoes colors
-  COLORS = {}
-
-  module DSL
-    colors = [
-      [:aliceblue, 240, 248, 255],
-      [:antiquewhite, 250, 235, 215],
-      [:aqua, 0, 255, 255],
-      [:aquamarine, 127, 255, 212],
-      [:azure, 240, 255, 255],
-      [:beige, 245, 245, 220],
-      [:bisque, 255, 228, 196],
-      [:black, 0, 0, 0],
-      [:blanchedalmond, 255, 235, 205],
-      [:blue, 0, 0, 255],
-      [:blueviolet, 138, 43, 226],
-      [:brown, 165, 42, 42],
-      [:burlywood, 222, 184, 135],
-      [:cadetblue, 95, 158, 160],
-      [:chartreuse, 127, 255, 0],
-      [:chocolate, 210, 105, 30],
-      [:coral, 255, 127, 80],
-      [:cornflowerblue, 100, 149, 237],
-      [:cornsilk, 255, 248, 220],
-      [:crimson, 220, 20, 60],
-      [:cyan, 0, 255, 255],
-      [:darkblue, 0, 0, 139],
-      [:darkcyan, 0, 139, 139],
-      [:darkgoldenrod, 184, 134, 11],
-      [:darkgray, 169, 169, 169],
-      [:darkgrey, 169, 169, 169],
-      [:darkgreen, 0, 100, 0],
-      [:darkkhaki, 189, 183, 107],
-      [:darkmagenta, 139, 0, 139],
-      [:darkolivegreen, 85, 107, 47],
-      [:darkorange, 255, 140, 0],
-      [:darkorchid, 153, 50, 204],
-      [:darkred, 139, 0, 0],
-      [:darksalmon, 233, 150, 122],
-      [:darkseagreen, 143, 188, 143],
-      [:darkslateblue, 72, 61, 139],
-      [:darkslategray, 47, 79, 79],
-      [:darkslategrey, 47, 79, 79],
-      [:darkturquoise, 0, 206, 209],
-      [:darkviolet, 148, 0, 211],
-      [:deeppink, 255, 20, 147],
-      [:deepskyblue, 0, 191, 255],
-      [:dimgray, 105, 105, 105],
-      [:dimgrey, 105, 105, 105],
-      [:dodgerblue, 30, 144, 255],
-      [:firebrick, 178, 34, 34],
-      [:floralwhite, 255, 250, 240],
-      [:forestgreen, 34, 139, 34],
-      [:fuchsia, 255, 0, 255],
-      [:gainsboro, 220, 220, 220],
-      [:ghostwhite, 248, 248, 255],
-      [:gold, 255, 215, 0],
-      [:goldenrod, 218, 165, 32],
-      [:green, 0, 128, 0],
-      [:greenyellow, 173, 255, 47],
-      [:honeydew, 240, 255, 240],
-      [:hotpink, 255, 105, 180],
-      [:indianred, 205, 92, 92],
-      [:indigo, 75, 0, 130],
-      [:ivory, 255, 255, 240],
-      [:khaki, 240, 230, 140],
-      [:lavender, 230, 230, 250],
-      [:lavenderblush, 255, 240, 245],
-      [:lawngreen, 124, 252, 0],
-      [:lemonchiffon, 255, 250, 205],
-      [:lightblue, 173, 216, 230],
-      [:lightcoral, 240, 128, 128],
-      [:lightcyan, 224, 255, 255],
-      [:lightgoldenrodyellow, 250, 250, 210],
-      [:lightgreen, 144, 238, 144],
-      [:lightgray, 211, 211, 211],
-      [:lightgrey, 211, 211, 211],
-      [:lightpink, 255, 182, 193],
-      [:lightsalmon, 255, 160, 122],
-      [:lightseagreen, 32, 178, 170],
-      [:lightskyblue, 135, 206, 250],
-      [:lightslategray, 119, 136, 153],
-      [:lightslategrey, 119, 136, 153],
-      [:lightsteelblue, 176, 196, 222],
-      [:lightyellow, 255, 255, 224],
-      [:lime, 0, 255, 0],
-      [:limegreen, 50, 205, 50],
-      [:linen, 250, 240, 230],
-      [:magenta, 255, 0, 255],
-      [:maroon, 128, 0, 0],
-      [:mediumaquamarine, 102, 205, 170],
-      [:mediumblue, 0, 0, 205],
-      [:mediumorchid, 186, 85, 211],
-      [:mediumpurple, 147, 112, 219],
-      [:mediumseagreen, 60, 179, 113],
-      [:mediumslateblue, 123, 104, 238],
-      [:mediumspringgreen, 0, 250, 154],
-      [:mediumturquoise, 72, 209, 204],
-      [:mediumvioletred, 199, 21, 133],
-      [:midnightblue, 25, 25, 112],
-      [:mintcream, 245, 255, 250],
-      [:mistyrose, 255, 228, 225],
-      [:moccasin, 255, 228, 181],
-      [:navajowhite, 255, 222, 173],
-      [:navy, 0, 0, 128],
-      [:oldlace, 253, 245, 230],
-      [:olive, 128, 128, 0],
-      [:olivedrab, 107, 142, 35],
-      [:orange, 255, 165, 0],
-      [:orangered, 255, 69, 0],
-      [:orchid, 218, 112, 214],
-      [:palegoldenrod, 238, 232, 170],
-      [:palegreen, 152, 251, 152],
-      [:paleturquoise, 175, 238, 238],
-      [:palevioletred, 219, 112, 147],
-      [:papayawhip, 255, 239, 213],
-      [:peachpuff, 255, 218, 185],
-      [:peru, 205, 133, 63],
-      [:pink, 255, 192, 203],
-      [:plum, 221, 160, 221],
-      [:powderblue, 176, 224, 230],
-      [:purple, 128, 0, 128],
-      [:red, 255, 0, 0],
-      [:rosybrown, 188, 143, 143],
-      [:royalblue, 65, 105, 225],
-      [:saddlebrown, 139, 69, 19],
-      [:salmon, 250, 128, 114],
-      [:sandybrown, 244, 164, 96],
-      [:seagreen, 46, 139, 87],
-      [:seashell, 255, 245, 238],
-      [:sienna, 160, 82, 45],
-      [:silver, 192, 192, 192],
-      [:skyblue, 135, 206, 235],
-      [:slateblue, 106, 90, 205],
-      [:slategray, 112, 128, 144],
-      [:slategrey, 112, 128, 144],
-      [:snow, 255, 250, 250],
-      [:springgreen, 0, 255, 127],
-      [:steelblue, 70, 130, 180],
-      [:tan, 210, 180, 140],
-      [:teal, 0, 128, 128],
-      [:thistle, 216, 191, 216],
-      [:tomato, 255, 99, 71],
-      [:turquoise, 64, 224, 208],
-      [:violet, 238, 130, 238],
-      [:wheat, 245, 222, 179],
-      [:white, 255, 255, 255],
-      [:whitesmoke, 245, 245, 245],
-      [:yellow, 255, 255, 0],
-      [:yellowgreen, 154, 205, 50],
-      [:shoes_background, 237, 237, 237],
-    ]
-
-    colors.each do |color_name, r, g, b|
-      Shoes::COLORS[color_name] = Shoes::Color.new(r, g, b)
-      define_method(color_name) do |alpha = Shoes::Color::OPAQUE|
-        color = Shoes::COLORS.fetch(color_name)
-        return color if alpha == Shoes::Color::OPAQUE
-        Shoes::Color.new(color.red, color.green, color.blue, alpha)
-      end
-    end
   end
 end
+
+require 'shoes/color/hex_converter'
+require 'shoes/color/dsl_helpers'
+require 'shoes/color/dsl'