freightrain 0.6.1 → 0.6.2

data/README.rdoc

@@ -1,4 +1,6 @@
-= freightrain - full speed ahead!
+= freightrain
+
+full speed ahead!
 
 == WHAT IS IT?
 Freightrain is a MVVM (model/view/viewmodel) framework for developing desktop applications in ruby
@@ -9,7 +11,9 @@ Freightrain is a MVVM (model/view/viewmodel) framework for developing desktop ap
 (also make sure you have the latest ruby/gnome2 bindings installed (=> 0.19.3) ) 
 
 == HOW DO I USE IT?
-For now, you should take a look at http://github.com/bolthar/rubydraulica 
+For now, you should take a look at http://github.com/bolthar/rubydraulica
+
+Note that the project is currently in ALPHA state. Use it in production at your own risk :-) 
 
 To get a working stub, install the gem and then:
 	ftrain app my_app
@@ -18,10 +22,18 @@ this will create a new directory
 containing the application stub. To run it, cd into the directory and:
 	ruby my_app.rb
 
+'ftrain' command not working? Look here => http://stackoverflow.com/questions/909673/gems-and-ubuntu-9-04
 
 Documentation coming soon.
 
 == WHERE DO I REPORT BUGS/FEATURE REQUESTS?
+
 andrea@andreadallera.com
 
+Would also be very appreciated:
+
+=== Reports about installation issues (GTK2, ruby/gnome, ftrain)
+=== Reports about different platforms (could you install on OSX? Let me know!)
+
+
 

data/Rakefile

@@ -9,7 +9,7 @@ require 'rake/testtask'
 
 spec = Gem::Specification.new do |s|
   s.name = 'freightrain'
-  s.version = '0.6.1'
+  s.version = '0.6.2'
   s.add_dependency('require_all', '>= 1.1.0')
   s.add_dependency('needle', '>= 1.3.0')  
   s.has_rdoc = false

data/bin/ftrain

@@ -1,5 +1,8 @@
 #!/usr/bin/ruby
 
 require "rubygems"
-require File.join(File.dirname(__FILE__),
-  "..", "lib", "scaffolding", "scaffolding.rb")
+
+#HACK!!1!!
+$scaffolding = true
+
+require "freightrain"

data/lib/extensions/gtk/interface_builder.rb

@@ -34,7 +34,8 @@ module Freightrain
       def connect_to_callback(widget, event_name, method)
         begin
         widget.signal_connect(event_name) do |instance, *args|
-          method.call(*args)
+          arguments = [instance, *args].first(method.arity.abs)
+          method.call(*arguments)
         end
         rescue Exception => ex
           #TODO:handle this

data/lib/freightrain.rb

@@ -5,4 +5,6 @@ require 'needle'
 require 'require_all'
 require 'tmpdir'
 
-require_all File.dirname(__FILE__) + '/freightrain'
+#HACK!!1!!
+require File.join(File.dirname(__FILE__), 'scaffolding', 'scaffolding.rb') if $scaffolding
+require_all File.join(File.dirname(__FILE__), 'freightrain')

data/lib/freightrain/auto_requirer.rb

@@ -10,15 +10,14 @@ module Freightrain
 
     require_all views_folder
     require_all viewmodels_folder
+    require_all services_folder if self.must_import?(services_folder)
+    require_all domain_folder   if self.must_import?(domain_folder)
+  
+  end
 
-    if File.directory?(services_folder) && Dir.entries(services_folder).length > 2
-      require_all services_folder
-    end
-    
-    if File.directory?(domain_folder) && Dir.entries(domain_folder).length > 2
-      require_all domain_folder
-    end
-    
+  private
+  def self.must_import?(directory)
+    return File.directory?(directory) && Dir.entries(directory).length > 2
   end
   
 end

data/lib/freightrain/testhelpers.rb

@@ -1,2 +1,2 @@
 
-require File.dirname(__FILE__) + '/testhelpers/container_helpers.rb'
+require File.dirname(__FILE__) + '/testhelpers/container_helpers.rb'

data/lib/scaffolding/commands/app.rb

@@ -2,7 +2,7 @@
 class AppCommand
 
   def initialize(*args)
-    raise "name parameter must be specified" if args.length < 1
+    raise "'name' parameter must be specified" if args.length < 1
     @name = args[0]
     @dir  = Dir.pwd
     @path = File.join(@dir, @name)
@@ -14,15 +14,16 @@ class AppCommand
 
   def execute
     FileUtils.mkdir(@path)
-    FileUtils.mkdir(File.join(@path, "views"))
-    FileUtils.mkdir(File.join(@path, "viewmodels"))
-    FileUtils.mkdir(File.join(@path, "services"))
-    FileUtils.mkdir(File.join(@path, "domain"))
+    FileUtils.mkdir(File.join(@path, "lib"))
+    FileUtils.mkdir(File.join(@path, "lib", "views"))
+    FileUtils.mkdir(File.join(@path, "lib", "viewmodels"))
+    FileUtils.mkdir(File.join(@path, "lib", "services"))
+    FileUtils.mkdir(File.join(@path, "lib", "domain"))
     Generator.create_stub(File.join(@path, "#{@name}.rb"),"application", :name => @name)
-    Generator.create_stub(File.join(@path, "views", "#{@name}_view.rb"), "view", :name => @name.capitalize)
-    Generator.create_stub(File.join(@path, "views", "#{@name}_view.glade"), "view_toplevel_glade",:name => @name)
-    Generator.create_stub(File.join(@path, "views", "#{@name}_view.bnd.yml"), "view_bnd", :name => @name)
-    Generator.create_stub(File.join(@path, "viewmodels", "#{@name}_view_model.rb"), "view_model", :name => @name.capitalize)
+    Generator.create_stub(File.join(@path, "lib", "views", "#{@name}_view.rb"), "view_toplevel", :name => @name.capitalize, :toplevel => @name)
+    Generator.create_stub(File.join(@path, "lib", "views", "#{@name}_view.glade"), "view_toplevel_glade",:name => @name)
+    Generator.create_stub(File.join(@path, "lib", "views", "#{@name}_view.bnd.yml"), "view_bnd", :name => @name)
+    Generator.create_stub(File.join(@path, "lib", "viewmodels", "#{@name}_view_model.rb"), "viewmodel_toplevel", :name => @name.capitalize)
     print "Application created in #{@path}\n"
   end
   

data/lib/scaffolding/generator.rb

@@ -6,7 +6,9 @@ class Generator
     File.open(File.dirname(__FILE__) + "/templates/#{template}.ftt") do |file|
       template_content = file.lines.to_a.join
     end
-    template_content.gsub!("$NAME", options[:name])
+    options.keys.each do |param|
+      template_content.gsub!("$#{param}".upcase, "#{options[param]}")
+    end
     File.open(filename, 'w+') do |file|
       file << template_content
     end

data/lib/scaffolding/templates/application.ftt

@@ -1,11 +1,9 @@
-#generated by ftrain
-
 require 'rubygems'
 require 'freightrain'
 
 include Freightrain
 
-Freightrain.app_path = File.dirname(__FILE__)
+Freightrain.app_path = File.join(File.dirname(__FILE__), "lib")
 
 Freightrain.toolkit = :gtk
 Freightrain.start(:$NAME)

data/lib/scaffolding/templates/view.ftt

@@ -1,4 +1,3 @@
-#generated by ftrain
 
 class $NAMEView < FreightView
 

data/lib/scaffolding/templates/view_model.ftt

@@ -1,7 +1,4 @@
-#generated by ftrain
 
 class $NAMEViewModel < FreightViewModel
 
-    $REGIONS
-
 end

data/lib/scaffolding/templates/view_toplevel.ftt

@@ -0,0 +1,6 @@
+
+class $NAMEView < FreightView
+
+  signal :quit, :forwards => "$TOPLEVEL.destroy"
+
+end

data/lib/scaffolding/templates/viewmodel_toplevel.ftt

@@ -0,0 +1,8 @@
+
+class $NAMEViewModel < FreightViewModel
+
+  def on_quit
+    Toolkit.quit
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: freightrain
 version: !ruby/object:Gem::Version 
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors: 
 - Andrea Dallera
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-31 00:00:00 +02:00
+date: 2010-04-05 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -48,12 +48,13 @@ files:
 - lib/scaffolding/scaffolding.rb
 - lib/scaffolding/commands/app.rb
 - lib/scaffolding/commands/triad.rb
-- lib/scaffolding/ftrain.rb
 - lib/scaffolding/templates/view_control_glade.ftt
 - lib/scaffolding/templates/view_toplevel_glade.ftt
 - lib/scaffolding/templates/view_bnd.ftt
 - lib/scaffolding/templates/view.ftt
 - lib/scaffolding/templates/application.ftt
+- lib/scaffolding/templates/view_toplevel.ftt
+- lib/scaffolding/templates/viewmodel_toplevel.ftt
 - lib/scaffolding/templates/view_model.ftt
 - lib/extensions/gtk/interface_builder.rb
 - lib/extensions/gtk/dialog_helper.rb

data/lib/scaffolding/ftrain.rb

@@ -1,23 +0,0 @@
-
-require "rubygems"
-require "require_all"
-
-require_all File.dirname(__FILE__) + "/commands"
-
-require File.dirname(__FILE__) + "/generator.rb"
-
-begin
-  klass = eval("#{ARGV[0].capitalize}Command")
-rescue
-  print "No command '#{ARGV[0]}'\n"
-end
-
-begin
-  command = klass.new(*ARGV[1...ARGV.length])
-  command.check
-  command.execute
-rescue Exception => ex
-  print ex.message + "\n"
-end
-
-