shoes 4.0.0.pre1 → 4.0.0.pre2

data/samples/simple-visibility.rb

@@ -0,0 +1,11 @@
+Shoes.app do
+  slot = stack do
+    background lightsteelblue
+    para 'Some content'
+    button 'Hello' do alert 'hi there' end
+  end
+
+  button 'Show' do slot.show end
+  button 'Hide' do slot.hide end
+  button 'Toggle' do slot.toggle end
+end

data/samples/simple-widget.rb

@@ -0,0 +1,9 @@
+class MyWidget < Shoes::Widget
+  def initialize(color, args)
+    background color
+  end
+end
+
+Shoes.app do
+  my_widget green,  width: 170, height: 120
+end

data/samples/swt-raw.rb

@@ -0,0 +1,20 @@
+#!/usr/bin/env ruby
+
+require 'java'
+$:.unshift(File.expand_path("../../lib", __FILE__))
+require 'swt'
+
+class ButtonExample
+
+  def initialize
+    style  = ::Swt::SWT::CLOSE | ::Swt::SWT::MIN | ::Swt::SWT::V_SCROLL #| ::Swt::SWT::MAX | ::Swt::SWT::RESIZE
+    @shell = Swt::Widgets::Shell.new(style)
+    @shell.open
+  end
+
+  def start
+    ::Swt.event_loop { @shell.disposed? }
+  end
+end
+
+ButtonExample.new.start

data/samples/troll.rb

@@ -0,0 +1,22 @@
+require 'pry'
+require 'pry-nav'
+require 'shoes/swt/leak_hunter'
+
+Shoes.app do
+  every(1) do
+    print "!"
+    clear
+    stack width:100 do
+      background green
+
+      button "quit" do
+        clear
+        quit
+      end
+
+      100.times do
+        para "b", link("kind", fg: red)
+      end
+    end
+  end
+end

data/shoes.gemspec

@@ -1,5 +1,6 @@
 # -*- encoding: utf-8 -*-
-require File.expand_path('../lib/shoes/version', __FILE__)
+require_relative 'lib/shoes/version'
+require_relative 'manifests/shoes'
 
 Gem::Specification.new do |s|
   s.name        = "shoes"
@@ -12,30 +13,17 @@ Gem::Specification.new do |s|
   s.description = %q{Shoes is the best little GUI toolkit for Ruby. Shoes makes building for Mac, Windows, and Linux super simple. Shoes runs on JRuby only for now.}
   s.license     = 'MIT'
 
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.files         = ShoesManifest.files
+  s.test_files    = ShoesManifest.test_files
   s.require_paths = ["lib"]
 
-  # Curious why we don't install shoes? See ext/Rakefile for the nitty-gritty.
-  s.executables   = ['shoes-stub', 'ruby-shoes']
-  s.extensions    = ['ext/install/Rakefile']
+  s.add_dependency "shoes-dsl", Shoes::VERSION
+  s.add_dependency "shoes-swt", Shoes::VERSION
 
-  s.add_dependency "swt", "~>0.18"
-  s.add_dependency "furoshiki", ">=0.1.2"
+  s.add_dependency "furoshiki", ">=0.1.2" # For packaging
   s.add_dependency "nokogiri" # For converting the manual to HTML
-  s.add_dependency "after_do", "~>0.3"
-
-  s.add_development_dependency "guard"
-  s.add_development_dependency "guard-rspec"
-  s.add_development_dependency "pry"
 
-  s.add_development_dependency "rspec", "~>2.10"
-  s.add_development_dependency "rake"
-
-  s.add_development_dependency "yard"
-  s.add_development_dependency "kramdown"
-  s.add_development_dependency 'simplecov'
-  s.add_development_dependency 'coveralls'
-  s.add_development_dependency 'jruby-lint'
-  s.add_development_dependency 'webmock'
+  # Curious why we don't install shoes? See ext/Rakefile for the nitty-gritty.
+  s.executables   = ['shoes-stub', 'ruby-shoes']
+  s.extensions    = ['ext/install/Rakefile']
 end

data/static/manual-en.txt

@@ -1692,10 +1692,10 @@ also set, shapes drawn will not be visible.
 Draws a line using the current line color (aka "stroke") starting at
 coordinates (left, top) and ending at coordinates (x2, y2).
 
-=== oval(left, top, radius) » Shoes::Shape ===
+=== oval(left, top, diameter) » Shoes::Shape ===
 
 Draws a circular form at pixel coordinates (left, top) with a width and height
-of `radius` pixels.  The line and fill colors are used to draw the shape.  By
+of `diameter` pixels.  The line and fill colors are used to draw the shape.  By
 default, the coordinates are for the oval's leftmost, top corner, but this can
 be changed by calling the [[Art.transform]] method or by using the `:center`
 style on the next method below.
@@ -1718,21 +1718,21 @@ Draw circular form using a style hash.  The following styles are supported:
 
  * `top`: the y-coordinate for the oval pen.
  * `left`: the x-coordinate for the oval pen.
- * `radius`: the width and height of the circle.
+ * `diameter`: the width and height of the circle.
  * `width`: a specific pixel width for the oval.
  * `height`: a specific pixel height for the oval.
  * `center`: do the coordinates specific the oval's center? (true or false)
 
 These styles may also be altered using the `style` method on the Shape object.
 
-=== rect(top, left, width, height, corners = 0) » Shoes::Shape ===
+=== rect(left, top, width, height, corners = 0) » Shoes::Shape ===
 
-Draws a rectangle starting from coordinates (top, left) with dimensions of
+Draws a rectangle starting from coordinates (left, top) with dimensions of
 width x height.  Optionally, you may give the rectangle rounded corners with a
 fifth argument: the radius of the corners in pixels.
 
 Alternate Call:
-rect(top, left, sidelength): Will draw a square with sides having the given length
+rect(left, top, sidelength): Will draw a square with sides having the given length
 
 
 As with all other shapes, the rectangle is drawn using the stroke and fill colors.
@@ -1754,8 +1754,8 @@ method for a rectangle which defaults to filling its parent box.
 
 Draw a rectangle using a style hash.  The following styles are supported:
 
- * `top`: the y-coordinate for the rectangle.
  * `left`: the x-coordinate for the rectangle.
+ * `top`: the y-coordinate for the rectangle.
  * `curve`: the pixel radius of the rectangle's corners.
  * `width`: a specific pixel width for the rectangle.
  * `height`: a specific pixel height for the rectangle.
@@ -1806,6 +1806,15 @@ the other methods in this [[Art]] section) inside a shape, but they will not be
 part of the line.  They will be more like a group of shapes are all drawn as
 one.
 
+=== shape(styles) » Shoes::Shape ===
+
+Draw an arbitrary shape using a style hash. The following styles are supported:
+
+ * `left`: the x-coordinate for the shape.
+ * `top`: the y-coordinate for the shape.
+
+These styles may also be altered using the `style` method on the shape object.
+
 === star(left, top, points = 10, outer = 100.0, inner = 50.0) » Shoes::Shape ===
 
 Draws a star using the stroke and fill colors.  The star is positioned with its

data/tasks/changelog.rb

@@ -0,0 +1,92 @@
+class Changelog
+  CATEGORY_MAPPING = [
+    {pattern: 'Changelog: feature', heading: 'New features'},
+    {pattern: 'Changelog: improvement', heading: 'Improvements'},
+    {pattern: 'Changelog: bugfix', heading: 'Bug Fixes'}
+  ]
+
+  COMMIT_SEPARATOR     = '<--COMMIT-->'
+  BODY_START_SEPARATOR = '<--BODY-START-->'
+  BODY_END_SEPARATOR   = '<--BODY-END-->'
+
+  def generate(categories = CATEGORY_MAPPING)
+    commit_range = commits_on_master_since_last_release
+    changes = categorize_commits(categories, commit_range)
+    changes << contributors(commit_range) if changes.any?
+    changes.compact.join("\n\n")
+  end
+
+  private
+  def categorize_commits(categories, commit_range)
+    categorized_commits = []
+
+    changes = categories.inject([]) do |list, category|
+      commits = commits_matching(category[:pattern], commit_range)
+      categorized_commits.concat commits
+      list << changes_under_heading(category[:heading], commits)
+    end
+
+    changes << misc_changes(commit_range, categorized_commits)
+    changes
+  end
+
+  def heading(title, count, underline_char = '-')
+    title_with_count = "#{title} (#{count})"
+    underline = underline_char * title_with_count.length
+    "#{title_with_count}\n#{underline}\n\n"
+  end
+
+  def commits_matching(pattern, commit_range)
+    grep_placeholder = '{TOKEN}'
+    log_command_template = "git log --regexp-ignore-case --grep '#{grep_placeholder}' --format='%s#{BODY_START_SEPARATOR}%b#{BODY_END_SEPARATOR} [%h]#{COMMIT_SEPARATOR}' #{commit_range}"
+    log_command = log_command_template.gsub(grep_placeholder, pattern)
+
+    commits =`#{log_command}`
+    raise "Bad \`git log\` command. Using <#{log_command}>" unless $?.success?
+
+    commits.split(COMMIT_SEPARATOR + "\n").map{|commit| uniform_change_log(commit)}
+  end
+
+  def uniform_change_log(commit)
+    '* ' + extract_changelog_message(commit)
+  end
+
+  def extract_changelog_message commit
+    if commit =~ /Merge pull request/i
+      message = commit.sub(/Merge pull request.*#{BODY_START_SEPARATOR}/i, '')
+      message.sub /((\n.*#{BODY_END_SEPARATOR})|#{BODY_END_SEPARATOR})/m, ''
+    else
+      commit.sub /#{BODY_START_SEPARATOR}.*#{BODY_END_SEPARATOR}/m, ''
+    end
+  end
+
+  def misc_changes(commit_range, categorized_commits)
+    misc_change_commits = commits_matching('Changelog', commit_range).reject {|commit| categorized_commits.include? commit }
+    changes_under_heading('Miscellaneous', misc_change_commits)
+  end
+
+  def changes_under_heading(title, commits)
+    if commits.any?
+      heading = heading(title, commits.length)
+      heading << commits.join("\n")
+    end
+  end
+
+  def contributors(commit_range)
+    contributors = `git shortlog --numbered --summary #{commit_range}`.split("\n")
+    heading = heading("Contributors", contributors.length)
+    names = contributors.map {|line| line.sub(/^.*\t/, '')}.join(", ")
+    heading << names
+  end
+
+  def commits_on_master_since_last_release
+    last_sha = `git rev-list --tags --max-count=1`.chomp
+    last_release = `git describe #{last_sha}`.chomp
+    commit_range = "#{last_release}..master"
+  end
+end
+
+desc "Generate changelog entries since last release"
+task :changelog do
+  puts Changelog.new.generate
+end

data/tasks/gem.rb

@@ -0,0 +1,38 @@
+require 'bundler/gem_helper'
+
+# Define placeholder tasks so we can name them as dependencies. The bodies
+# of these tasks will be defined by Bundler at runtime.
+task :build
+task :install
+task :release
+
+desc 'Build all gems'
+task 'build:all'
+
+desc 'Install all gems'
+task 'install:all'
+
+['shoes-dsl', 'shoes-swt', 'shoes'].each do |lib|
+  # Defer installing Bundler gem tasks until runtime, so we can install them
+  # for a particular gem. Still create tasks that will show up in `rake --tasks`
+  # Note that executing #install_tasks multiple times will *add* to the defined
+  # tasks, so we can build up build:all and install:all tasks.
+  task "install_gem_tasks:#{lib}" do
+    Bundler::GemHelper.install_tasks :name => lib
+  end
+
+  desc "Build the #{lib} gem"
+  task "build:#{lib}" => ["install_gem_tasks:#{lib}", :build]
+
+  desc "Install the #{lib} gem"
+  task "install:#{lib}" => ["install_gem_tasks:#{lib}", :install]
+
+  desc "Release the #{lib} gem"
+  task "release:#{lib}" => ["install_gem_tasks:#{lib}", :release]
+
+  task "build:all" => "install_gem_tasks:#{lib}"
+  task "install:all" => "install_gem_tasks:#{lib}"
+end
+
+task 'build:all' => 'build'
+task 'install:all' => 'install'

data/tasks/rspec.rb

@@ -0,0 +1,106 @@
+require 'jruby'
+JRuby.runtime.instance_config.runRubyInProcess = false
+
+# thanks Dan Lucraft!
+def jruby_run(cmd, swt = false)
+  opts = "-J-XstartOnFirstThread" if swt && RbConfig::CONFIG["host_os"] =~ /darwin/
+
+  # see https://github.com/jruby/jruby/wiki/FAQs
+  # "How can I increase the heap/memory size when launching a sub-JRuby?"
+  sh( "jruby --debug --1.9 -Ispec #{opts} -S #{cmd}" )
+end
+
+def rspec(files, options = "")
+  rspec_opts = "#{options} #{files}"
+  "rspec --tty #{rspec_opts}"
+end
+
+# run rspec in separate Jruby JVM
+def jruby_rspec(files, args)
+  swt = args.delete(:swt)
+  rspec_opts = spec_opts_from_args(args)
+  rspec_opts << " #{ENV['RSPEC_OPTS']}"
+
+  jruby_run(rspec(files, rspec_opts), swt)
+end
+
+def spec_opts_from_args(args)
+  opts = []
+  opts << "-e ::#{args[:module]}" if args[:module]
+  opts += Array(args[:require]).map {|lib| "-r#{lib}"}
+  opts += args[:excludes].map { |tag| "--tag ~#{tag}" } if args[:excludes]
+  opts += args[:includes].map { |tag| "--tag #{tag}" } if args[:includes]
+  opts.join ' '
+end
+
+def swt_args(args)
+  args = args.to_hash
+  args[:swt] = true
+  args[:require] = 'swt_shoes/spec_helper'
+  # Adjust includes/excludes appropriately
+  # args[:includes] = [:swt]
+  args[:excludes] = [:no_swt]
+  args[:excludes] << :fails_on_osx if RbConfig::CONFIG["host_os"] =~ /darwin/
+  args
+end
+
+task :default => :spec
+
+desc "Run all specs"
+task :spec, [:module] => "spec:all"
+
+namespace :spec do
+  desc "Run all specs for Shoes DSL and SWT backend
+  Limit the examples to specific :modules :
+    Animation
+    App
+    Button
+    Flow
+
+  ie. $ rake spec:all[Flow]
+  "
+  task "all", [:module] do |t, args|
+    Rake::Task["spec:shoes"].invoke(args[:module])
+    Rake::Task["spec:swt"].invoke(args[:module])
+  end
+
+  task :swt, [:module] do |t, args|
+    Rake::Task['spec:swt:all'].invoke(args[:module])
+  end
+
+  namespace :swt do
+    desc "Run all specs with SWT backend
+    Limit the examples to specific :modules : "
+    task :all, [:module] do |t, args|
+      argh = swt_args(args)
+      files = (Dir['spec/swt_shoes/**/*_spec.rb'] + Dir['spec/shoes/**/*_spec.rb']).join ' '
+      jruby_rspec(files, argh)
+    end
+
+    desc "Run SWT backend specs isolated from DSL"
+    task :isolation, [:module] do |t, args|
+      argh = swt_args(args)
+      files = Dir['spec/swt_shoes/**/*_spec.rb'].join ' '
+      jruby_rspec(files, argh)
+    end
+
+    desc "Run DSL specs integrated with SWT backend"
+    task :integration, [:module] do |t, args|
+      argh = swt_args(args)
+      files = Dir['spec/shoes/**/*_spec.rb'].join ' '
+      jruby_rspec(files, argh)
+    end
+  end
+
+  desc "Run specs for Shoes DSL
+  Limit the examples to specific :modules : "
+  task :dsl, [:module] do |t, args|
+    argh = args.to_hash
+    files = Dir['spec/shoes/**/*_spec.rb'].join ' '
+    jruby_rspec(files, argh)
+  end
+
+  task :shoes, [:module] do |t, args|
+    Rake::Task['spec:dsl'].invoke(args[:module])
+  end
+end

data/tasks/sample.rb

@@ -0,0 +1,66 @@
+SAMPLES_DIR = "samples"
+
+namespace :samples do
+  def samples_from_file(filename)
+    samples = File.read("#{SAMPLES_DIR}/#{filename}").lines
+    samples.map {|s| s.sub(/#.*$/, '')}.map(&:strip).select {|s| s != ''}.map {|s| "#{SAMPLES_DIR}/#{s}"}
+  end
+
+  def working_samples
+    samples = samples_from_file "README"
+    puts "#{samples.size} samples are known to work"
+    samples
+  end
+
+  def non_samples
+    all_samples = Dir[File.join(SAMPLES_DIR, '*.rb')]
+    result = all_samples - working_samples
+    puts "#{result.size} samples are not known to work"
+    result
+  end
+
+  def run_sample(sample_name, index, total)
+    puts "Running #{sample_name} (#{index + 1} of #{total})...quit to run next sample"
+    system "bin/shoes #{sample_name}"
+  end
+
+  def run_samples(samples)
+    samples.each_with_index do |sample, index|
+      run_sample(sample, index, samples.size)
+    end
+  end
+
+  desc "Run all working samples in random order"
+  task :random do |t|
+    puts t.comment
+    run_samples working_samples.shuffle
+  end
+
+  desc "Run all working samples in alphabetical order"
+  task :good do |t|
+    puts t.comment
+    run_samples working_samples.sort
+  end
+
+  desc "Run all non-working samples in random order"
+  task :bad do |t|
+    puts t.comment
+    run_samples non_samples.shuffle
+  end
+
+  desc "Create list of non-working samples"
+  task :bad_list do |t|
+    puts t.comment
+    non_samples.each{|non_sample| puts non_sample}
+  end
+
+  desc "Run all samples listed in samples/filename"
+  task :subset, [:filename] do |t, args|
+    puts t.comment
+    run_samples samples_from_file(args[:filename])
+  end
+end
+
+task :samples     => ['samples:random']
+task :non_samples => ['samples:bad']
+task :list_non_samples => ['samples:bad_list']