ffi-tk 2010.08.23 → 2018.02.20

data/gemset.nix

@@ -0,0 +1,134 @@
+{
+  ast = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0pp82blr5fakdk27d1d21xq9zchzb6vmyb1zcsl520s3ygvprn8m";
+      type = "gem";
+    };
+    version = "2.3.0";
+  };
+  bacon = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1f06gdj77bmwzc1k5iragl1595hbn67yc7sqvs56ca8plrr2vmai";
+      type = "gem";
+    };
+    version = "1.2.0";
+  };
+  coderay = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "15vav4bhcc2x3jmi3izb11l4d9f3xv8hp2fszb7iqmpsccv1pz4y";
+      type = "gem";
+    };
+    version = "1.1.2";
+  };
+  docile = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0m8j31whq7bm5ljgmsrlfkiqvacrw6iz9wq10r3gwrv5785y8gjx";
+      type = "gem";
+    };
+    version = "1.1.5";
+  };
+  ffi = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1nkcrmxqr0vb1y4rwliclwlj2ajsi4ddpdx2gvzjy0xbkk5iqzfp";
+      type = "gem";
+    };
+    version = "1.9.14";
+  };
+  json = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1lhinj9vj7mw59jqid0bjn2hlfcnq02bnvsx9iv81nl2han603s0";
+      type = "gem";
+    };
+    version = "2.0.2";
+  };
+  method_source = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0xqj21j3vfq4ldia6i2akhn2qd84m0iqcnsl49kfpq3xk6x0dzgn";
+      type = "gem";
+    };
+    version = "0.9.0";
+  };
+  parser = {
+    dependencies = ["ast"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1nply96nqrkgx8d3jay31sfy5p4q74dg8ymln0mdazxx5cz2n8bq";
+      type = "gem";
+    };
+    version = "2.3.3.1";
+  };
+  powerpack = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1fnn3fli5wkzyjl4ryh0k90316shqjfnhydmc7f8lqpi0q21va43";
+      type = "gem";
+    };
+    version = "0.1.1";
+  };
+  pry = {
+    dependencies = ["coderay" "method_source"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1mh312k3y94sj0pi160wpia0ps8f4kmzvm505i6bvwynfdh7v30g";
+      type = "gem";
+    };
+    version = "0.11.3";
+  };
+  rainbow = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0frz90gyi5k26jx3ham1x661hpkxf82rkxb85nakcz70dna7i8ri";
+      type = "gem";
+    };
+    version = "2.2.1";
+  };
+  rubocop = {
+    dependencies = ["parser" "powerpack" "rainbow" "ruby-progressbar" "unicode-display_width"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0604qa0s0xcq0avnh9aa6iw58azpz6a7bavcs0ch61xnaz0qfl0c";
+      type = "gem";
+    };
+    version = "0.46.0";
+  };
+  ruby-progressbar = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1qzc7s7r21bd7ah06kskajc2bjzkr9y0v5q48y0xwh2l55axgplm";
+      type = "gem";
+    };
+    version = "1.8.1";
+  };
+  simplecov = {
+    dependencies = ["docile" "json" "simplecov-html"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0ffhyrfnq2zm2mc1742a4hqy475g3qa1zf6yfldwg1ldh5sn3qbx";
+      type = "gem";
+    };
+    version = "0.12.0";
+  };
+  simplecov-html = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1qni8g0xxglkx25w54qcfbi4wjkpvmb28cb7rj5zk3iqynjcdrqf";
+      type = "gem";
+    };
+    version = "0.10.0";
+  };
+  unicode-display_width = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0lfkyv3c6nyy96jv8wvy33x6g1gmigbm1ficpb2mzhyk07assrnr";
+      type = "gem";
+    };
+    version = "1.1.2";
+  };
+}

data/lib/ffi-tk.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'thread'
 require 'ffi'
 
@@ -7,7 +8,9 @@ module Tk
   TCL_LIBPATH = ENV['TCL_LIBPATH'].to_s.split(':')
   TK_LIBPATH  = ENV[ 'TK_LIBPATH'].to_s.split(':')
 
-  if FFI::Platform.mac?
+  HOST_OS = RbConfig::CONFIG['host_os']
+
+  if HOST_OS =~ /darwin/
     if ENV['NO_AQUA'] || ENV['USE_X11'] # macports-x11 libtk
       TCL_LIBPATH << '/opt/local/lib/libtcl8.5.dylib'
       TK_LIBPATH  << '/opt/local/lib/libtk8.5.dylib'
@@ -20,17 +23,13 @@ module Tk
   TCL_LIBPATH << 'tcl' << 'tcl86' << 'tcl85' << 'tcl8.6' << 'tcl8.5'
   TK_LIBPATH  <<  'tk' <<  'tk86' <<  'tk85' <<  'tk8.6' <<  'tk8.5'
 
+  # In some cases Tk has trouble running, this seems to happen on windows and
+  # OSX/TkAqua mostly.
+  # In these cases please use:
+  #   module Tk; RUN_EVENTLOOP_ON_MAIN_THREAD = true; end
+  # before you require 'tk'
   unless const_defined?(:RUN_EVENTLOOP_ON_MAIN_THREAD)
-    if FFI::Platform.mac?
-      # In some cases Tk has trouble running, this seems to happen on windows and
-      # OSX/TkAqua mostly.
-      # In these cases please use:
-      #   module Tk; RUN_EVENTLOOP_ON_MAIN_THREAD = true; end
-      # before you require 'tk'
-      RUN_EVENTLOOP_ON_MAIN_THREAD = true
-    else
-      RUN_EVENTLOOP_ON_MAIN_THREAD = false
-    end
+    RUN_EVENTLOOP_ON_MAIN_THREAD = HOST_OS =~ /darwin/
   end
 
   DONT_WAIT     = 1 << 1

data/lib/ffi-tk/command.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
 module Tk
   require 'ffi-tk/command/choose_color'
   require 'ffi-tk/command/choose_directory'
+  require 'ffi-tk/command/dialog'
   require 'ffi-tk/command/event'
   require 'ffi-tk/command/get_open_file'
   require 'ffi-tk/command/get_save_file'
@@ -19,7 +21,6 @@ module Tk
   autoload :Clipboard, 'ffi-tk/command/clipboard'
   autoload :Configure, 'ffi-tk/command/configure'
   autoload :Destroy,   'ffi-tk/command/destroy'
-  autoload :Dialog,    'ffi-tk/command/dialog'
   autoload :Focus,     'ffi-tk/command/focus'
   autoload :Font,      'ffi-tk/command/font'
   autoload :Grab,      'ffi-tk/command/grab'
@@ -35,5 +36,5 @@ module Tk
   autoload :WM,        'ffi-tk/command/wm'
   autoload :Wait,      'ffi-tk/command/wait'
   autoload :Winfo,     'ffi-tk/command/winfo'
-  autoload :Scrollable,'ffi-tk/command/scrollable'
+  autoload :Scrollable, 'ffi-tk/command/scrollable'
 end

data/lib/ffi-tk/command/after.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Tk
   module After
     module_function
@@ -7,11 +8,11 @@ module Tk
         id = nil
         block = Proc.new
 
-        wrap = lambda{|*args|
+        wrap = lambda do |*_args|
           block.call
           Tk.unregister_proc(id)
           true
-        }
+        end
 
         id, command = Tk.register_proc(wrap, 'after_ms')
         Tk.execute_only(:after, ms, command)
@@ -20,14 +21,14 @@ module Tk
       end
     end
 
-    def idle(&block)
+    def idle
       id = nil
-    
-      wrap = lambda{|*args|
-        block.call
+
+      wrap = lambda do |*_args|
+        yield
         Tk.unregister_proc(id)
         true
-      }
+      end
 
       id, command = Tk.register_proc(wrap, 'after_idle')
       Tk.execute_only(:after, :idle, command)

data/lib/ffi-tk/command/bell.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Tk
   module Bell
     # This command rings the bell on the display for window and returns an empty
@@ -31,4 +32,4 @@ module Tk
       Bell.bell(options)
     end
   end
-end
+end

data/lib/ffi-tk/command/bind.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Tk
   module Bind
     def self.bind(tag, sequence = None)

data/lib/ffi-tk/command/bindtags.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Tk
   # Determine which bindings apply to a window, and order of evaluation
   #

data/lib/ffi-tk/command/cget.rb

@@ -1,34 +1,36 @@
+# frozen_string_literal: true
 module Tk
   module Cget
     CGET_MAP = {}
 
-    insert = lambda{|type, array|
-      array.each{|option| CGET_MAP["-#{option}"] = type } }
+    insert = lambda do |type, array|
+      array.each { |option| CGET_MAP["-#{option}"] = type }
+    end
 
-    insert[:integer, %w[
+    insert[:integer, %w(
       height width maxundo spacing1 spacing2 spacing3 borderwidth bd
       highlightthickness insertborderwidth insertofftime insertontime
       insertwidth padx pady selectborderwidth endline startline length
       maximum
-    ]]
-    insert[:boolean, %w[
+    )]
+    insert[:boolean, %w(
       autoseparators blockcursor undo exportselection setgrid takefocus
-    ]]
-    insert[:color, %w[
+    )]
+    insert[:color, %w(
       inactiveselectbackground disabledbackground disabledforeground background
       bg foreground fg highlightbackground highlightcolor insertbackground
       selectbackground selectforeground readonlybackground
-    ]]
-    insert[:command, %w[
+    )]
+    insert[:command, %w(
       invalidcommand invcmd yscrollcommand xscrollcommand validatecommand
       command vcmd
-    ]]
-    insert[:string, %w[ tabs cursor text show default class ]]
-    insert[:font, %w[ font ]]
-    insert[:symbol, %w[ wrap tabstyle relief justify validate orient mode selectmode ]]
-    insert[:variable, %w[ textvariable ]]
-    insert[:bitmap, %w[ stipple ]]
-    insert[:list, %w[ padding state style columns displaycolumns ]]
+    )]
+    insert[:string, %w(tabs cursor text show default class)]
+    insert[:font, %w(font)]
+    insert[:symbol, %w(wrap tabstyle relief justify validate orient mode selectmode)]
+    insert[:variable, %w(textvariable)]
+    insert[:bitmap, %w(stipple)]
+    insert[:list, %w(padding state style columns displaycolumns)]
 
     def cget(option)
       option = option.to_tcl_option
@@ -41,26 +43,31 @@ module Tk
       if type = CGET_MAP[name.to_tcl_option]
         type_to_ruby(type, value)
       else
-        raise "Unknown type for %p: %p" % [name, value]
+        raise 'Unknown type for %p: %p' % [name, value]
       end
     end
 
     def type_to_ruby(type, value)
       case type
       when :integer
-        value.to_i
+        value.respond_to?(:to_i?) ? value.to_i? : value.to_i
       when :symbol
-        value.to_sym?
+        value&.to_sym
       when :boolean
         Tk.boolean(value)
       when :color, :string, :font, :bitmap
         value.respond_to?(:to_s?) ? value.to_s? : value
       when :variable
-        if name = value.to_s?
-          Variable.new(name)
-        end
+        Variable.new(value.to_s?) if value.respond_to?(:to_s?)
       when :list
-        value.to_a
+        case value
+        when Array
+          value
+        when String
+          value.split
+        else
+          value.to_a
+        end
       when :float
         value.to_f
       when :pathname
@@ -69,7 +76,7 @@ module Tk
         string = value.to_s
         string unless string.empty?
       else
-        raise "Unknown type: %p: %p" % [type, value]
+        raise 'Unknown type: %p: %p' % [type, value]
       end
     end
 

data/lib/ffi-tk/command/choose_color.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Tk
   module_function
 
@@ -26,4 +27,4 @@ module Tk
   def choose_color(options = None)
     Tk.execute(:tk_chooseColor, options.to_tcl_options?).to_s?
   end
-end
+end

data/lib/ffi-tk/command/choose_directory.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Tk
   module_function
 
@@ -42,4 +43,4 @@ module Tk
   def choose_directory(options = None)
     Tk.execute(:tk_chooseDirectory, options.to_tcl_options?).to_s?
   end
-end
+end

data/lib/ffi-tk/command/clipboard.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Tk
   # Manipulate Tk clipboard
   #
@@ -13,7 +14,7 @@ module Tk
     end
 
     def clipboard_append(options = {})
-      Clipboard.append({displayof: self}.merge(options))
+      Clipboard.append({ displayof: self }.merge(options))
     end
 
     def clipboard_get(type = None)
@@ -76,10 +77,10 @@ module Tk
 
       format = format.to_s.upcase if format
 
-      args << "-displayof" << displayof if displayof
-      args << "-format" << format.to_s.upcase if format
-      args << "-type" << type.to_s.upcase if type
-      args << "--" << data.to_s
+      args << '-displayof' << displayof if displayof
+      args << '-format' << format.to_s.upcase if format
+      args << '-type' << type.to_s.upcase if type
+      args << '--' << data.to_s
 
       Tk.execute_only(:clipboard, :append, *args)
     end

data/lib/ffi-tk/command/configure.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Tk
   module Configure
     # Query or modify the configuration options of the widget.
@@ -31,7 +32,7 @@ module Tk
         elsif argument.respond_to?(:to_tcl_option)
           receiver.execute(*invocation, argument.to_tcl_option)
         else
-          raise ArgumentError, "Invalid argument: %p" % [argument]
+          raise ArgumentError, 'Invalid argument: %p' % [argument]
         end
 
       if result.respond_to?(:tcl_options_to_hash)
@@ -46,24 +47,25 @@ module Tk
     end
 
     def register_command(name, &block)
-      case name
-      when :validatecommand
-        # %d Type of action: 1 for insert, 0 for delete, or -1 for focus, forced
-        #    or textvariable validation.
-        # %i Index of char string to be inserted/deleted, if any, otherwise -1.
-        # %P The value of the entry if the edit is allowed.
-        #    If you are configuring the entry widget to have a new textvariable,
-        #    this will be the value of that textvariable.
-        # %s The current value of entry prior to editing.
-        # %S The text string being inserted/deleted, if any, {} otherwise.
-        # %v The type of validation currently set.
-        # %V The type of validation that triggered the callback (key, focusin,
-        #    focusout, forced).
-        # %W The name of the entry widget.
-        arg = '%d %i %P %s %S %v %V %W'
-      else
-        arg = ''
-      end
+      arg =
+        case name
+        when :validatecommand
+          # %d Type of action: 1 for insert, 0 for delete, or -1 for focus, forced
+          #    or textvariable validation.
+          # %i Index of char string to be inserted/deleted, if any, otherwise -1.
+          # %P The value of the entry if the edit is allowed.
+          #    If you are configuring the entry widget to have a new textvariable,
+          #    this will be the value of that textvariable.
+          # %s The current value of entry prior to editing.
+          # %S The text string being inserted/deleted, if any, {} otherwise.
+          # %v The type of validation currently set.
+          # %V The type of validation that triggered the callback (key, focusin,
+          #    focusout, forced).
+          # %W The name of the entry widget.
+          '%d %i %P %s %S %v %V %W'
+        else
+          ''
+        end
 
       @commands ||= {}
 
@@ -71,7 +73,7 @@ module Tk
       id, command = Tk.register_proc(block, arg)
       @commands[name] = id
 
-      return command
+      command
     end
 
     def unregister_command(name, id = @commands[name])
@@ -82,7 +84,7 @@ module Tk
 
     def unregister_commands
       return unless @commands
-      @commands.each{|name, id| unregister_command(name, id) }
+      @commands.each { |name, id| unregister_command(name, id) }
     end
   end
 end