rugui 1.3.3 → 1.4.0

data/Changelog

@@ -1,3 +1,12 @@
+1.4.0
+- Using thor for generators.
+
+1.3.4
+- Checking if Object#instance_exec is already defined in GTK framework adapter.
+- Fixed some Ruby 1.9 compatibility issues
+- Fixed require of 'activesupport' to 'active_support' since the latter is now the correct way to require it.
+- Fixed clone of nil obseravable properties
+
 1.3.3
 - Fixed loading of RSpec tasks by the application task loader when RSpec gem is not installed.
 - Updated README to explain usage of both testing frameworks, Test::Unit and RSpec.

data/bin/rugui

@@ -1,7 +1,9 @@
 #!/usr/bin/env ruby
+# -*- mode: ruby -*-
 
 require 'rubygems'
-require 'rubigen'
+require 'thor/group'
+require 'rugui/generators'
 
 if %w(-v --version).include? ARGV.first
   require 'rugui/version'
@@ -9,8 +11,4 @@ if %w(-v --version).include? ARGV.first
   exit(0)
 end
 
-require 'rubigen/scripts/generate'
-source = RubiGen::PathSource.new(:application, File.join(File.dirname(__FILE__), "../rugui_generators"))
-RubiGen::Base.reset_sources
-RubiGen::Base.append_sources source
-RubiGen::Scripts::Generate.new.run(ARGV, :generator => 'rugui')
+Rugui.start

data/lib/packing/release.rb

@@ -8,13 +8,14 @@ begin
     gemspec.description = "A simple MVC framework for RubyGTK."
     gemspec.authors = ["Vicente Mundim", "Felipe Mesquita", "Claudio Escudero"]
     gemspec.add_dependency(%q<activesupport>, [">= 2.1.1"])
-    gemspec.add_dependency(%q<rubigen>, [">= 1.5.1"])
-    gemspec.version = "1.3.2"
-    gemspec.date = %q{2009-08-04}
+    gemspec.add_dependency(%q<thor>, [">= 0.13.3"])
+    gemspec.date = %q{2010-02-19}
     gemspec.rubyforge_project = "rugui"
     gemspec.executables = ['rugui']
-    gemspec.files = FileList["bin/*", "lib/**/*", "rugui_generators/**/*", "script/*", "spec/**/*", "Changelog", "LICENSE", "Rakefile", "README"].to_a
+    gemspec.files = FileList["bin/*", "lib/**/*", "script/*", "Changelog", "LICENSE", "Rakefile", "README"].to_a
+    gemspec.test_files = FileList["spec/**/*"].to_a
   end
+  Jeweler::GemcutterTasks.new
 rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+  puts "Jeweler not available. Install it with: sudo gem install jeweler"
 end

data/lib/rugui.rb

@@ -1,5 +1,5 @@
 require 'rubygems'
-require 'activesupport'
+require 'active_support'
 
 module RuGUI
   class << self

data/lib/rugui/framework_adapters/GTK.rb

@@ -1,25 +1,27 @@
 require 'gtk2'
 require 'libglade2'
 
-# See the discussion here: http://eigenclass.org/hiki.rb?instance_exec
-class Object
-  module InstanceExecHelper; end
-  include InstanceExecHelper
-  def instance_exec(*args, &block)
-    begin
-      old_critical, Thread.critical = Thread.critical, true
-      n = 0
-      n += 1 while respond_to?(mname="__instance_exec#{n}")
-      InstanceExecHelper.module_eval{ define_method(mname, &block) }
-    ensure
-      Thread.critical = old_critical
-    end
-    begin
-      ret = send(mname, *args)
-    ensure
-      InstanceExecHelper.module_eval{ remove_method(mname) } rescue nil
+unless Object.respond_to?(:instance_exec) # Ruby 1.9 does already has Object#instance_exec
+  # See the discussion here: http://eigenclass.org/hiki.rb?instance_exec
+  class Object
+    module InstanceExecHelper; end
+    include InstanceExecHelper
+    def instance_exec(*args, &block)
+      begin
+        old_critical, Thread.critical = Thread.critical, true
+        n = 0
+        n += 1 while respond_to?(mname="__instance_exec#{n}")
+        InstanceExecHelper.module_eval{ define_method(mname, &block) }
+      ensure
+        Thread.critical = old_critical
+      end
+      begin
+        ret = send(mname, *args)
+      ensure
+        InstanceExecHelper.module_eval{ remove_method(mname) } rescue nil
+      end
+      ret
     end
-    ret
   end
 end
 
@@ -64,7 +66,7 @@ module Gtk
   end
 
   def Gtk.get_style_file_contents(path, filename)
-    IO.read(File.join(path, filename)).sub('{ROOT_PATH}', RuGUI.configuration.root_path)
+    IO.read(File.join(path, filename)).sub('{ROOT_PATH}', RuGUI.configuration.root_path.to_s)
   end
 end
 

data/lib/rugui/generators.rb

@@ -0,0 +1 @@
+require File.join(File.dirname(__FILE__), 'generators', 'rugui', 'rugui')

data/lib/rugui/generators/rugui/rugui.rb

@@ -0,0 +1,89 @@
+class Rugui < Thor::Group
+  include Thor::Actions
+
+  argument :app_path
+  argument :name
+
+  class_option :framework_adapter, :type => :string, :aliases => 'a', :default => 'gtk',
+                :desc => "Choose which framework adapter to use, must either 'gtk' or 'qt'"
+
+  class_option :test_framework, :type => :string, :aliases => 't', :default => 'RSpec',
+                :desc => "Choose which test framework to use, defaults to 'RSpec', but can be set to 'test-unit' also"
+
+  class_option :version, :type => :boolean, :aliases => "-v", :group => :rugui,
+                           :desc => "Show RuGUI version number and quit"
+ 
+  class_option :help, :type => :boolean, :aliases => "-h", :group => :rugui,
+                      :desc => "Show this help message and quit"
+
+  def self.source_root
+    File.expand_path(File.join(File.dirname(__FILE__), 'templates'))
+  end
+
+  def create_root
+    self.destination_root = File.expand_path(app_path, destination_root)
+    empty_directory '.'
+
+    FileUtils.cd(destination_root)
+  end
+
+  def create_root_files
+    copy_file 'README'
+    copy_file 'Rakefile'
+  end
+
+  def create_bin_files
+    empty_directory 'bin'
+    
+    inside 'bin' do
+      copy_file 'main_executable', "#{name}"
+      chmod "#{name}", 0755
+
+      template 'main_executable.bat', "#{name}.bat"
+      chmod "#{name}.bat", 0755
+    end
+  end
+
+  def create_app_files
+    empty_directory 'app'
+
+    inside 'app' do
+      copy_file 'main.rb'
+    end
+  end
+
+  def create_config_files
+    directory 'config'
+  end
+
+  def create_lib_files
+    directory 'lib'
+  end
+
+  def create_log_files
+    directory 'log'
+  end
+
+  def create_vendor_files
+    directory 'vendor'
+  end
+
+  def create_framework_specific_files
+    directory framework_specific_file('app/controllers'), 'app/controllers'
+    directory framework_specific_file('app/views'), 'app/views'
+    directory framework_specific_file('app/resources'), 'app/resources'
+  end
+
+  def create_test_files
+    directory test_framework_dir
+  end
+
+  private
+    def framework_specific_file(path)
+      File.join('framework_specific', options[:framework_adapter], path)
+    end
+
+    def test_framework_dir
+      options[:test_framework] == 'RSpec' ? 'spec' : 'test'
+    end
+end

data/{rugui_generators/rugui/templates/main_executable.bat.erb → lib/rugui/generators/rugui/templates/bin/main_executable.bat}

@@ -1,6 +1,6 @@
 # ATTENTION: This is just a sample, it it not tested at all!
 
-@set APPLICATION_ROOT=<%= application_root %>
+@set APPLICATION_ROOT=<%= destination_root %>
 @set APPLICATION_EXECUTABLE=%APPLICATION_ROOT%\app\main.rb
 @set RUBY_EXECUTABLE=c:\ruby\1.8\ruby
 @set RUGUI_ENV=production

data/lib/rugui/observable_property_support.rb

@@ -188,7 +188,7 @@ module RuGUI
             end
 
             def #{property}=(value)
-              old_value = get_old_value(@#{property})
+              old_value = clone_if_possible(@#{property})
               if has_changed?(value, old_value)
                 @#{property} = ObservablePropertyProxy.new(value, self, '#{property}')
                 property_changed('#{property}', value, old_value)
@@ -233,20 +233,12 @@ module RuGUI
         @named_observers = {} if not defined?(@named_observers) or @named_observers.nil?
       end
 
-      def get_old_value(property)
-        begin
-          return property.clone
-        rescue TypeError
-          return property
-        end
-      end
-
       def has_changed?(new_value, old_value)
         !(new_value.kind_of?(old_value.class) && old_value == new_value)
       end
 
       def clone_if_possible(value)
-        value.clone
+        value.clone unless value.nil?
       rescue TypeError
         value
       end

data/script/spec

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+if ARGV.any? {|arg| %w[--drb -X --generate-options -G --help -h --version -v].include?(arg)}
+  require 'rubygems' unless ENV['NO_RUBYGEMS']
+else
+  gem 'test-unit', '1.2.3' if RUBY_VERSION.to_f >= 1.9
+  ENV["RUGUI_ENV"] ||= 'test'
+  require 'rubygems' unless ENV['NO_RUBYGEMS']
+end
+require 'spec/autorun'
+exit ::Spec::Runner::CommandLine.run

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rugui
 version: !ruby/object:Gem::Version 
-  version: 1.3.3
+  version: 1.4.0
 platform: ruby
 authors: 
 - Vicente Mundim
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-12 00:00:00 -03:00
+date: 2010-02-19 00:00:00 -02:00
 default_executable: rugui
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,14 +25,14 @@ dependencies:
         version: 2.1.1
     version: 
 - !ruby/object:Gem::Dependency 
-  name: rubigen
+  name: thor
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.5.1
+        version: 0.13.3
     version: 
 description: A simple MVC framework for RubyGTK.
 email: 
@@ -66,6 +66,36 @@ files:
 - lib/rugui/framework_adapters/framework_adapter_support.rb
 - lib/rugui/gem_builder.rb
 - lib/rugui/gem_dependency.rb
+- lib/rugui/generators.rb
+- lib/rugui/generators/rugui/rugui.rb
+- lib/rugui/generators/rugui/templates/README
+- lib/rugui/generators/rugui/templates/Rakefile
+- lib/rugui/generators/rugui/templates/app/main.rb
+- lib/rugui/generators/rugui/templates/bin/main_executable
+- lib/rugui/generators/rugui/templates/bin/main_executable.bat
+- lib/rugui/generators/rugui/templates/config/boot.rb
+- lib/rugui/generators/rugui/templates/config/environments/development.rb.sample
+- lib/rugui/generators/rugui/templates/config/environments/production.rb.sample
+- lib/rugui/generators/rugui/templates/config/environments/test.rb.sample
+- lib/rugui/generators/rugui/templates/framework_specific/gtk/app/controllers/application_controller.rb
+- lib/rugui/generators/rugui/templates/framework_specific/gtk/app/controllers/main_controller.rb
+- lib/rugui/generators/rugui/templates/framework_specific/gtk/app/resources/glade/main_view.glade
+- lib/rugui/generators/rugui/templates/framework_specific/gtk/app/resources/styles/main.rc
+- lib/rugui/generators/rugui/templates/framework_specific/gtk/app/views/application_view.rb
+- lib/rugui/generators/rugui/templates/framework_specific/gtk/app/views/main_view.rb
+- lib/rugui/generators/rugui/templates/framework_specific/gtk/app/views/view_helpers/application_view_helper.rb
+- lib/rugui/generators/rugui/templates/framework_specific/gtk/app/views/view_helpers/main_view_helper.rb
+- lib/rugui/generators/rugui/templates/framework_specific/qt/app/controllers/application_controller.rb
+- lib/rugui/generators/rugui/templates/framework_specific/qt/app/controllers/main_controller.rb
+- lib/rugui/generators/rugui/templates/framework_specific/qt/app/resources/ui/main_view.ui
+- lib/rugui/generators/rugui/templates/framework_specific/qt/app/views/application_view.rb
+- lib/rugui/generators/rugui/templates/framework_specific/qt/app/views/main_view.rb
+- lib/rugui/generators/rugui/templates/framework_specific/qt/app/views/view_helpers/application_view_helper.rb
+- lib/rugui/generators/rugui/templates/framework_specific/qt/app/views/view_helpers/main_view_helper.rb
+- lib/rugui/generators/rugui/templates/spec/rcov.opts
+- lib/rugui/generators/rugui/templates/spec/spec.opts
+- lib/rugui/generators/rugui/templates/spec/spec_helper.rb
+- lib/rugui/generators/rugui/templates/test/test_helper.rb
 - lib/rugui/initialize_hooks.rb
 - lib/rugui/initializer.rb
 - lib/rugui/log_support.rb
@@ -85,86 +115,10 @@ files:
 - lib/rugui/tasks/test_application.rake
 - lib/rugui/vendor_gem_source_index.rb
 - lib/rugui/version.rb
-- rugui_generators/controller/USAGE
-- rugui_generators/controller/controller_generator.rb
-- rugui_generators/controller/templates/controller.erb
-- rugui_generators/generators_support.rb
-- rugui_generators/model/USAGE
-- rugui_generators/model/model_generator.rb
-- rugui_generators/model/templates/model.erb
-- rugui_generators/pack/USAGE
-- rugui_generators/pack/pack_generator.rb
-- rugui_generators/pack/templates/README
-- rugui_generators/rugui/USAGE
-- rugui_generators/rugui/rugui_generator.rb
-- rugui_generators/rugui/templates/GTK/application_controller.rb
-- rugui_generators/rugui/templates/GTK/application_view.rb
-- rugui_generators/rugui/templates/GTK/application_view_helper.rb
-- rugui_generators/rugui/templates/GTK/environment.rb
-- rugui_generators/rugui/templates/GTK/main.rc
-- rugui_generators/rugui/templates/GTK/main_controller.rb
-- rugui_generators/rugui/templates/GTK/main_view.glade
-- rugui_generators/rugui/templates/GTK/main_view.rb
-- rugui_generators/rugui/templates/GTK/main_view_helper.rb
-- rugui_generators/rugui/templates/Qt4/application_controller.rb
-- rugui_generators/rugui/templates/Qt4/application_view.rb
-- rugui_generators/rugui/templates/Qt4/application_view_helper.rb
-- rugui_generators/rugui/templates/Qt4/environment.rb
-- rugui_generators/rugui/templates/Qt4/main_controller.rb
-- rugui_generators/rugui/templates/Qt4/main_view.rb
-- rugui_generators/rugui/templates/Qt4/main_view.ui
-- rugui_generators/rugui/templates/Qt4/main_view_helper.rb
-- rugui_generators/rugui/templates/README
-- rugui_generators/rugui/templates/Rakefile
-- rugui_generators/rugui/templates/boot.rb
-- rugui_generators/rugui/templates/development.rb.sample
-- rugui_generators/rugui/templates/main.rb
-- rugui_generators/rugui/templates/main_executable.bat.erb
-- rugui_generators/rugui/templates/main_executable.erb
-- rugui_generators/rugui/templates/production.rb.sample
-- rugui_generators/rugui/templates/rcov.opts
-- rugui_generators/rugui/templates/spec.opts
-- rugui_generators/rugui/templates/spec_helper.rb
-- rugui_generators/rugui/templates/test.rb.sample
-- rugui_generators/rugui/templates/test_helper.rb
-- rugui_generators/view/USAGE
-- rugui_generators/view/templates/toplevels/about_dialog.glade
-- rugui_generators/view/templates/toplevels/assistant.glade
-- rugui_generators/view/templates/toplevels/color_selection_dialog.glade
-- rugui_generators/view/templates/toplevels/dialog_box.glade
-- rugui_generators/view/templates/toplevels/file_chooser_dialog.glade
-- rugui_generators/view/templates/toplevels/font_selection_dialog.glade
-- rugui_generators/view/templates/toplevels/input_dialog.glade
-- rugui_generators/view/templates/toplevels/message_dialog.glade
-- rugui_generators/view/templates/toplevels/recent_chooser_dialog.glade
-- rugui_generators/view/templates/toplevels/window.glade
-- rugui_generators/view/templates/view.erb
-- rugui_generators/view/templates/view.glade
-- rugui_generators/view/templates/view.ui
-- rugui_generators/view/templates/view_helper.erb
-- rugui_generators/view/view_generator.rb
 - script/console
 - script/destroy
 - script/generate
-- spec/framework/base_controller_spec.rb
-- spec/framework/base_model_spec.rb
-- spec/framework/base_view_helper_spec.rb
-- spec/framework/base_view_spec.rb
-- spec/framework/log_support_spec.rb
-- spec/framework/observable_property_proxy_spec.rb
-- spec/framework/observable_property_support_spec.rb
-- spec/framework/property_observer_spec.rb
-- spec/helpers/controllers.rb
-- spec/helpers/initialize_hooks_helper.rb
-- spec/helpers/models.rb
-- spec/helpers/observables.rb
-- spec/helpers/view_helpers.rb
-- spec/helpers/views.rb
-- spec/rcov.opts
-- spec/resource_files/my_other_view.glade
-- spec/resource_files/my_view.glade
-- spec/spec.opts
-- spec/spec_helper.rb
+- script/spec
 - README.rdoc
 has_rdoc: true
 homepage: http://rugui.org
@@ -210,3 +164,7 @@ test_files:
 - spec/helpers/observables.rb
 - spec/helpers/controllers.rb
 - spec/helpers/views.rb
+- spec/spec.opts
+- spec/resource_files/my_other_view.glade
+- spec/resource_files/my_view.glade
+- spec/rcov.opts