Skip to content

Commit

Permalink
Merge branch 'master' of git@github.com:jschementi/silverline
Browse files Browse the repository at this point in the history
  • Loading branch information
jschementi committed Jun 30, 2008
2 parents 8018da4 + 669aca5 commit f7c374a
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 13 deletions.
11 changes: 3 additions & 8 deletions README
Expand Up @@ -10,6 +10,7 @@ integrated with the rest of the framework.

= Gimme!

http://github.com/jschementi/silverline
git clone git://github.com/jschementi/silverline.git

This repository holds a Rails test application, Rails 2.0.2 (in vendor/rails),
Expand All @@ -19,15 +20,9 @@ If you're just interested in the plugin, you can find it here.
Soon, this repository will only be for the plugin. Another repository will be
made for the test application.

== You'll also need:

1. Ruby 1.8.6
2. Silverlight 2 (Beta 2): Windows or Mac
Note: Silverline has the developer version of the Silverlight runtime in
You'll also need: Silverlight 2 (Beta 2): Windows or Mac
Note: Silverline has the developer version of the Silverlight runtime in
vendor/plugins/silveline/install
3. rubyzip: gem install rubyzip (http://rubyzip.sourceforge.net/)

(rubyzip will be packaged in the plugin shortly)

You can find more information on Lighthouse: http://silverline.lighthouseapp.com/.

Expand Down
Expand Up @@ -18,9 +18,8 @@ def self.register
create_directories
@watcher = FileSystemWatcher.new

[ Silverline::CLIENT_ROOT, Silverline::PLUGIN_CLIENT, "#{Silverline::PLUGIN_ROOT}/public",
"#{RAILS_ROOT}/public/ironruby"].each do |dir|
@watcher.addDirectory dir
[Silverline::CLIENT_ROOT, Silverline::PLUGIN_CLIENT].each do |dir|
@watcher.addDirectory dir
end

# TODO: watch all client controllers, as well as all views
Expand All @@ -41,6 +40,7 @@ def self.generate
# First copy the plugin's client folder to tmp folder
FileUtils.cp_r "#{Silverline::PLUGIN_CLIENT}/.", Silverline::TMP_CLIENT

# TODO: should the controller/views be handled by Visualize/Teleport?
# TODO: copy all controllers, views, and models to tmp folder
FileUtils.mkdir_p "#{Silverline::TMP_CLIENT}/controllers"
FileUtils.mkdir_p "#{Silverline::TMP_CLIENT}/views"
Expand Down
Expand Up @@ -34,9 +34,8 @@

@watcher.should_receive(:addDirectory).with(Silverline::CLIENT_ROOT)
@watcher.should_receive(:addDirectory).with(Silverline::PLUGIN_CLIENT)
@watcher.should_receive(:addDirectory).with("#{Silverline::PLUGIN_ROOT}/public")
@watcher.should_receive(:addDirectory).with("#{RAILS_ROOT}/public/ironruby")

# TODO: should the visualize/teleport stuff deal with defining what to watch?
#@watcher.should_receive(:addDirectory).with(Silverline::RAILS_CTRLRS)
@watcher.stub!(:addFile)
@watcher.should_receive(:addDirectory).with(Silverline::RAILS_VIEWS)
Expand Down Expand Up @@ -75,6 +74,7 @@

FileUtils.should_receive(:cp_r).with("#{Silverline::PLUGIN_CLIENT}/.", Silverline::TMP_CLIENT).ordered

# TODO: should Visualize/Essential be defining these folders to watch
FileUtils.should_receive(:mkdir_p).with("#{Silverline::TMP_CLIENT}/controllers").ordered
FileUtils.should_receive(:mkdir_p).with("#{Silverline::TMP_CLIENT}/views").ordered
FileUtils.should_receive(:cp).with('app/controllers/client_controller.rb', "#{Silverline::TMP_CLIENT}/controllers").ordered
Expand Down

0 comments on commit f7c374a

Please sign in to comment.