shoes 4.0.0.pre1 → 4.0.0.pre2

data/bin/ruby-shoes

@@ -2,5 +2,5 @@
 lib_directory = File.expand_path('../../lib', __FILE__)
 $LOAD_PATH << lib_directory
 
-require 'shoes/cli'
-Shoes::CLI.new.run ARGV
+require 'shoes/ui/cli'
+Shoes::CLI.new.run ARGV

data/ext/install/shoes.bat

@@ -1,6 +1,9 @@
 @setlocal enableextensions enabledelayedexpansion
 @echo off
-set bin_dir=%~dp0
+
+REM If we're running from source, bin/shoes.bat will have set bin_dir already.
+if not defined bin_dir set bin_dir=%~dp0
+
 set command=jruby --1.9 !bin_dir!/ruby-shoes %*
 call !command!
 endlocal

data/lib/shoes.rb

@@ -1,125 +1,5 @@
-require 'pathname'
 require 'tmpdir'
 require 'fileutils'
-require 'forwardable'
 
-require 'shoes/common/registration'
-
-class Shoes
-  PI                  = Math::PI
-  TWO_PI              = 2 * PI
-  HALF_PI             = 0.5 * PI
-  DIR                 = Pathname.new(__FILE__).join("../..").realpath.to_s
-  LOG                 = []
-  LEFT_MOUSE_BUTTON   = 1
-  MIDDLE_MOUSE_BUTTON = 2
-  RIGHT_MOUSE_BUTTON  = 3
-
-  extend Common::Registration
-
-  class << self
-
-    def logger
-      Shoes.configuration.logger_instance
-    end
-
-    # To ease the upgrade path from Shoes 3 we warn users they need to install
-    # and require gems themselves.
-    #
-    # @example
-    #   Shoes.setup do
-    #     gem 'bluecloth =2.0.6'
-    #     gem 'metaid'
-    #   end
-    #
-    # @param block [Proc] The block that describes the gems that are needed
-    # @deprecated
-    def setup(&block)
-      $stderr.puts "WARN: The Shoes.setup method is deprecated, you need to install gems yourself." +
-                   "You can do this using the 'gem install' command or bundler and a Gemfile."
-      DeprecatedShoesGemSetup.new.instance_eval(&block)
-    end
-
-    # Load the backend in memory. This does not set any configuration.
-    #
-    # @param name [String|Symbol] The name, such as :swt or :mock
-    # @return The backend
-    def load_backend(name)
-      begin
-        require "shoes/#{name.to_s.downcase}"
-        Shoes.const_get(name.to_s.capitalize)
-      rescue LoadError => e
-        raise LoadError, "Couldn't load backend Shoes::#{name.capitalize}'. Error: #{e.message}\n#{e.backtrace.join("\n")}"
-      end
-    end
-  end
-
-  class DeprecatedShoesGemSetup
-    def gem(name)
-      name, version = name.split()
-      install_cmd = 'gem install ' + name
-      install_cmd += " --version \"#{version}\"" if version
-      $stderr.puts "WARN: To use the '#{name}' gem, install it with '#{install_cmd}', and put 'require \"#{name}\"' at the top of your Shoes program."
-    end
-  end
-end
-
-require 'shoes/version'
-require 'shoes/renamed_delegate'
-require 'shoes/dimension'
-require 'shoes/dimensions'
-
-require 'shoes/color'
-
-require 'shoes/common/background_element'
-require 'shoes/common/changeable'
-require 'shoes/common/clickable'
-require 'shoes/common/common_methods'
-require 'shoes/common/fill'
-require 'shoes/common/state'
-require 'shoes/common/stroke'
-require 'shoes/common/style'
-require 'shoes/common/style_normalizer'
-require 'shoes/builtin_methods'
-require 'shoes/check_button'
+require 'shoes/ui/manual'
 require 'shoes/dsl'
-require 'shoes/text'
-require 'shoes/span'
-require 'shoes/input_box'
-
-# please keep this list tidy and alphabetically sorted
-require 'shoes/animation'
-require 'shoes/app'
-require 'shoes/arc'
-require 'shoes/background'
-require 'shoes/border'
-require 'shoes/button'
-require 'shoes/configuration'
-require 'shoes/color'
-require 'shoes/dialog'
-require 'shoes/download'
-require 'shoes/font'
-require 'shoes/gradient'
-require 'shoes/image'
-require 'shoes/image_pattern'
-require 'shoes/key_event'
-require 'shoes/line'
-require 'shoes/link'
-require 'shoes/link_hover'
-require 'shoes/list_box'
-require 'shoes/logger'
-require 'shoes/manual'
-require 'shoes/oval'
-require 'shoes/point'
-require 'shoes/progress'
-require 'shoes/radio'
-require 'shoes/rect'
-require 'shoes/shape'
-require 'shoes/slot_contents'
-require 'shoes/slot'
-require 'shoes/star'
-require 'shoes/sound'
-require 'shoes/text_block'
-require 'shoes/timer'
-require 'shoes/url'
-require 'shoes/widget'

data/lib/shoes/{cli.rb → ui/cli.rb}

@@ -22,6 +22,12 @@ Usage: #{opts.program_name} [-h] [-p package] file
           end
           @packages << Package.new(package)
         end
+
+        opts.on('-v', '--version', 'Shoes version') do
+          puts "Shoes #{VERSION}"
+          exit
+        end
+
         opts.separator "\nPackage types:"
         opts.separator package_types(opts)
         opts.separator "\nExamples:"
@@ -69,7 +75,7 @@ Usage: #{opts.program_name} [-h] [-p package] file
     # @param [String] app the location of the app to run
     def execute_app(app)
       $LOAD_PATH.unshift(Dir.pwd)
-      Shoes.configuration.backend = :swt
+      require 'shoes/swt'
       load app
     end
 

data/lib/shoes/{help.rb → ui/help.rb}

@@ -89,7 +89,7 @@ class Manual < Shoes
 
   def show_toc
     s = self
-    stack(height: 120){}
+    stack height: 30
     flow width: 0.2, margin_left: 10 do
       flow(margin_right: 20) do
         background black(0.7), curve: 5
@@ -529,7 +529,7 @@ class Manual < Shoes
   PEND = PNUMS.length
   TOC, TOC_LIST = [], []
   COLORS = Shoes::COLORS
-  VERSION = '4.0.0.pre0'
+  VERSION = Shoes::VERSION
 end
 
 Shoes.app title: 'The Shoes 4 Manual', width: 720, height: 640

data/lib/shoes/{manual.rb → ui/manual.rb}

@@ -1,6 +1,6 @@
 class Shoes
   def self.show_manual lang='English'
     $lang = lang
-    load File.join(DIR, 'lib/shoes/help.rb')
+    load File.join(DIR, 'lib/shoes/ui/help.rb')
   end
 end

data/lib/shoes/version.rb

@@ -1,3 +1,3 @@
 class Shoes
-  VERSION = "4.0.0.pre1"
+  VERSION = "4.0.0.pre2"
 end

data/manifests/common.rb

@@ -0,0 +1,34 @@
+require 'rake/file_list'
+
+module ShoesManifestReport
+  def report
+    puts "Manifest of #{gem_name} gem"
+    puts
+    puts "files"
+    puts "-----"
+    puts files.sort.join("\n")
+    puts
+    puts "test_files"
+    puts "----------"
+    puts test_files.sort.join("\n")
+    puts
+    puts "#{files.length} files, #{test_files.length} test_files"
+  end
+end
+
+class ShoesCommonManifest
+  def self.files
+    Rake::FileList[%w(
+      CHANGELOG
+      Gemfile
+      Guardfile
+      LICENSE
+      README.md
+      manifests/common.rb
+    )]
+  end
+
+  def self.test_files
+    []
+  end
+end

data/manifests/shoes.rb

@@ -0,0 +1,44 @@
+require_relative 'common'
+
+class ShoesManifest
+  extend ShoesManifestReport
+
+  def self.gem_name
+    'shoes'
+  end
+
+  def self.files
+    # Note we explicitly list files in bin rather than globbing.  Rubygems is
+    # unhappy otherwise with symlinks there when building the executable list.
+    @files = ShoesCommonManifest.files
+      .include(%w[
+        Rakefile
+        app.yaml
+        benchmark/**/*
+        bin/ruby-shoes
+        bin/shoes-guard
+        bin/shoes-stub
+        ext/**/*
+        lib/shoes.rb
+        lib/shoes/ui/**/*
+        lib/shoes/version.rb
+        manifests/shoes.rb
+        samples/**/*
+        snapshots/**/*
+        static/**/*
+        tasks/**/*
+        shoes.gemspec
+      ])
+      .include(test_files)
+  end
+
+  def self.test_files
+    @test_files = Rake::FileList['spec/shoes/ui/**/*']
+  end
+end
+
+
+if $0 == __FILE__
+  puts ShoesManifest.report
+end
+

data/samples/Gemfile

@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+
+gem 'shoes', '4.0.0.pre1', path: '..'

data/samples/Gemfile.lock

@@ -0,0 +1,35 @@
+PATH
+  remote: ..
+  specs:
+    shoes (4.0.0.pre1)
+      after_do (~> 0.3)
+      furoshiki (>= 0.1.2)
+      nokogiri
+      swt (~> 0.18)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    after_do (0.3.1)
+    furoshiki (0.1.2)
+      plist
+      rubyzip (< 1.0.0)
+      warbler
+    jruby-jars (1.7.12)
+    jruby-rack (1.1.14)
+    nokogiri (1.6.2.1-java)
+    plist (3.1.0)
+    rake (10.3.1)
+    rubyzip (0.9.9)
+    swt (0.18)
+    warbler (1.4.2)
+      jruby-jars (>= 1.5.6, < 2.0)
+      jruby-rack (>= 1.0.0)
+      rake (>= 0.9.6)
+      rubyzip (>= 0.9, < 1.1)
+
+PLATFORMS
+  java
+
+DEPENDENCIES
+  shoes (= 4.0.0.pre1)!

data/samples/README

@@ -6,7 +6,7 @@
 
 simple-anim-shapes.rb
 simple-animate.rb
-simple-arc.rb
+# simple-arc.rb  Pending on #423
 simple-bounce.rb
 simple-brightness-transitions.rb
 simple-button-animate.rb
@@ -33,17 +33,18 @@ simple-move.rb # (works but looks a bit weird on Linux, see issue #59)
 simple-oval.rb
 simple-sample-executor.rb
 simple-shoes-intro.rb
+simple-slide.rb
 simple-sound.rb
 simple-stripes.rb
 simple-timer.rb
+simple-visibility.rb
 
 good-arc.rb
 good-clock.rb
-good-clock-adjusted.rb
 good-follow.rb
 good-potato-chopping.rb
 good-reminder.rb
-# good-vjot.rb see #255
+good-vjot.rb
 
 expert-definr.rb
 expert-game-of-life-adjusted.rb
@@ -55,8 +56,17 @@ expert-snake.rb
 expert-tankspank.rb
 
 # examples from the nobody knows shoes book
+nks_booklist.rb
+nks_breadsticks.rb
+nks_dancing_circle.rb
+nks_dictionary.rb
+nks_edit_box.rb
+nks_edit_line.rb
+nks_notes.rb
 nks_poem.rb
-
+nks_self.rb
+nks_text_sizes.rb
+nks_trurl.rb
 
 class-book-adjusted.rb
 
@@ -78,9 +88,10 @@ sample21.rb
 sample23.rb
 sample24.rb
 sample27.rb
-sample31.rb
+#sample31.rb
 sample34.rb
 sample35.rb
 sample37.rb
 sample42.rb
 sample45.rb
+sample56.rb

data/samples/boom.rb

@@ -0,0 +1,239 @@
+Shoes.app do
+  #para "Text ", link(''), "without crashing!"
+  para "Text ", span('', underline: true), "without crashing!"
+end
+#Shoes.app do
+  #arc 210, 210, 200, 200, -0.0, 4.71238898038469
+  #10.times do |x|
+    #line 100 * x, 0, 100 * x, 1000
+    #line 0, 100 * x, 1000, 100 * x
+  #end
+  ##@p = para "Text", link("Boo") { alert("Yo") }, "More Text"
+  ##button "ok" do
+    ##@p.hide
+  ##end
+#end
+#Shoes.app do
+  #@main = stack do
+    #@i = image File.expand_path("~/.hacketyhack/pics/flower.jpg"), width: 100
+    #@i.click do
+      #@i.hide
+      #alert "BOO"
+    #end
+
+    #@p = rect 100, 100, 100, 100
+    #@p.click do
+      #@main.clear
+    #end
+
+  #end
+#end
+#
+#Shoes.app(resizable: false) do
+  #@what = "Boo"
+  #alert @what
+  #shape do
+    #background green
+    #stroke blue
+    #rect 10, 10, 10, 10
+    #@what = "Foo"
+  #end
+  #shape
+  #alert @what
+#end
+#class W1 < Shoes::Widget
+#def initialize
+#para 'Hello'
+#end
+#end
+
+#class W2 < Shoes::Widget
+#def initialize
+##w1
+#para "There"
+#edit_line #secret: true
+#end
+#end
+
+#Shoes.app do
+#w2
+#end
+
+#Shoes.app do
+#@main = stack do
+#@i = image File.expand_path("~/.hacketyhack/pics/flower.jpg"), width: 100
+#@i.click do
+#@main.clear
+#end
+#end
+#end
+#Shoes.app do
+
+#@page1 = button "home", left: 20
+#@page1.click do
+#homepage()
+#end
+
+#@page2 = button "logout", left: 200
+#@page2.click do
+#specialpage()
+#end
+
+## build the interface
+#@main_panel = stack do
+
+#title("I AM JUST A TITLE...",
+#top:    100,
+#font:   "Trebuchet MS 20px",
+#align:  "center",
+#stroke: black)
+
+#end
+
+#def homepage()
+
+## clear the panel
+#@main_panel.clear
+
+## add function buttons
+#@main_panel.append do
+
+#title("FLO Rollover Job:",
+#top:    100,
+#font:   "Trebuchet MS 20px",
+#align:  "center",
+#stroke: black)
+
+#flow(top: 150) do
+
+#stack(width: 150, left: 20) do
+#@add_user = image File.expand_path("~/.hacketyhack/pics/flower.jpg")
+#@add_user.click do
+#alert("a")
+#end
+
+##hover do
+##@add_user.displace(-5, -5)
+##end
+
+##leave do
+##@add_user.displace(0, 0)
+##end
+#end
+
+#stack(width: 150, left: 190) do
+                    #@add_item = image File.expand_path("~/.hacketyhack/pics/flower.jpg")
+                    #@add_item.click do
+                        #alert("b")
+                    #end
+
+                    ##hover do
+                        ##@add_item.displace(-5, -5)
+                    ##end
+
+                    ##leave do
+                        ##@add_item.displace(0, 0)
+                    ##end
+                #end
+
+                #stack(width: 150, left: 360) do
+                    #@add_question = image File.expand_path("~/.hacketyhack/pics/flower.jpg")
+                    #@add_question.click do
+                        #alert("c")
+                    #end
+
+                    ##hover do
+                        ##@add_question.displace(-5, -5)
+                    ##end
+
+                    ##leave do
+                        ##@add_question.displace(0, 0)
+                    ##end
+                #end
+
+            #end# end of flow
+
+        #end
+
+    #end
+
+    #def specialpage()
+
+        ## clear the panel
+        #@main_panel.clear
+
+        ## add function buttons
+        #@main_panel.append do
+
+            #title("I AM JUST A TITLE...",
+                  #top:    100,
+                  #font:   "Trebuchet MS 20px",
+                  #align:  "center",
+                  #stroke: black)
+
+        #end
+
+    #end
+
+#end # end of file
+##
+#Shoes.app do
+  #l = line(10, 10, 100, 100)
+  #@p = para l.style[:point_a]
+  #button "change the line!" do
+    #l.point_a = Shoes::Point.new(50,50)
+    #@p.replace l.style[:point_a]
+  #end
+#end
+#
+#Shoes.app do
+  #para "Text", @l = link("Ha") { alert "Hahaha" }
+  #@e = edit_line text: "Boo"
+  #button "Count" do
+    #@l.click do
+      #alert "Booo"
+    #end
+  #end
+  ##click do
+    ##alert @e.text
+  ##end
+  ##button("Ok").hide
+#end
+#Shoes.app width: 150 do
+  ##para "text goes here " * 3, size:16, fill: lightblue
+  ##para "text goes here " * 3, size:16, fill: lightgreen
+  ##para "text goes here " * 3, size:16, fill: lightgray
+  #@p = para "text goes here " * 3, size:16, fill: purple
+  ###line 0, 0, 100, 100, click: Proc.new { alert "opt" } do
+  #arc 0, 0, 100, 100, Shoes::TWO_PI, Shoes::PI, click: Proc.new { alert "opt" } do
+    #alert "boo"
+  #end
+
+  #keypress do
+    #@p.left += 10
+  #end
+  #click do |*args|
+    ##Shoes.app do
+      ##para "Another!"
+      ##click do |*_|
+        ##quit
+      ##end
+    ##end
+  #end
+#end
+#Shoes.app do
+  ##oval 100, 100, 100, click: Proc.new { alert "opt" } do
+  ##rect 100, 100, 100, 100, click: Proc.new { alert "opt" } do
+  ###line 0, 0, 100, 100, click: Proc.new { alert "opt" } do
+  ##star 100, 100, click: Proc.new { alert "opt" } do
+  ##arc 0, 0, 100, 100, Shoes::TWO_PI, Shoes::PI, click: Proc.new { alert "opt" } do
+  #image File.expand_path("/Users/jclark/.hacketyhack/pics/cora.jpg"), width: 100, click: Proc.new { alert "opt" } do
+    #alert "boo"
+  #end
+  ##b = check do
+    ##alert "boo"
+  ##end
+  ##b.click do
+    ##alert "clicky"
+  ##end
+#end