@@ -9,9 +9,9 @@ <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> <integer value="437"/> + <integer value="406"/> <integer value="424"/> <integer value="510"/> - <integer value="406"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -720,38 +720,6 @@ <object class="NSMutableArray" key="connectionRecords"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">runTaskDialog</string> - <reference key="source" ref="306027223"/> - <reference key="destination" ref="354722433"/> - </object> - <int key="connectionID">407</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">runTask:</string> - <reference key="source" ref="306027223"/> - <reference key="destination" ref="985793238"/> - </object> - <int key="connectionID">420</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">descriptionField</string> - <reference key="source" ref="306027223"/> - <reference key="destination" ref="942636774"/> - </object> - <int key="connectionID">421</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">taskField</string> - <reference key="source" ref="306027223"/> - <reference key="destination" ref="574999143"/> - </object> - <int key="connectionID">422</int> - </object> - <object class="IBConnectionRecord"> <object class="IBActionConnection" key="connection"> <string key="label">closeTaskWindow:</string> <reference key="source" ref="306027223"/> @@ -897,35 +865,67 @@ </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">statusHudWindow</string> + <string key="label">show_status_window_checkbox</string> + <reference key="source" ref="306027223"/> + <reference key="destination" ref="709926930"/> + </object> + <int key="connectionID">517</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">deployment_status_spinner</string> + <reference key="source" ref="306027223"/> + <reference key="destination" ref="423011419"/> + </object> + <int key="connectionID">519</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">run_task:</string> + <reference key="source" ref="306027223"/> + <reference key="destination" ref="985793238"/> + </object> + <int key="connectionID">520</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">status_hud_window</string> <reference key="source" ref="306027223"/> <reference key="destination" ref="289870146"/> </object> - <int key="connectionID">513</int> + <int key="connectionID">521</int> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">statusHudWindowText</string> + <string key="label">status_hud_window_text</string> <reference key="source" ref="306027223"/> <reference key="destination" ref="135332522"/> </object> - <int key="connectionID">514</int> + <int key="connectionID">522</int> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">show_status_window_checkbox</string> + <string key="label">run_task_dialog</string> <reference key="source" ref="306027223"/> - <reference key="destination" ref="709926930"/> + <reference key="destination" ref="354722433"/> </object> - <int key="connectionID">517</int> + <int key="connectionID">523</int> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">deployment_status_spinner</string> + <string key="label">description_field</string> <reference key="source" ref="306027223"/> - <reference key="destination" ref="423011419"/> + <reference key="destination" ref="942636774"/> </object> - <int key="connectionID">519</int> + <int key="connectionID">524</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">task_field</string> + <reference key="source" ref="306027223"/> + <reference key="destination" ref="574999143"/> + </object> + <int key="connectionID">525</int> </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> @@ -1533,9 +1533,9 @@ <reference ref="5"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <reference ref="5"/> - <string>{{9, 353}, {371, 206}}</string> + <string>{{557, 344}, {371, 206}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{9, 353}, {371, 206}}</string> + <string>{{557, 344}, {371, 206}}</string> <reference ref="5"/> <string>{{120, 647}, {371, 206}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -1561,17 +1561,17 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <reference ref="5"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{522, 127}, {571, 327}}</string> + <string>{{502, 604}, {571, 327}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{522, 127}, {571, 327}}</string> + <string>{{502, 604}, {571, 327}}</string> <reference ref="6"/> <reference ref="5"/> <string>{571, 303}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <real value="0.000000e+00"/> + <reference ref="6"/> <reference ref="1011511934"/> - <real value="0.000000e+00"/> - <real value="0.000000e+00"/> + <reference ref="6"/> + <reference ref="6"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -1599,7 +1599,7 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">519</int> + <int key="maxID">525</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -1664,7 +1664,7 @@ <object class="NSMutableArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> <string>closeTaskWindow:</string> - <string>runTask:</string> + <string>run_task:</string> <string>show_about:</string> <string>show_status:</string> </object> @@ -1681,13 +1681,13 @@ <object class="NSMutableArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> <string>deployment_status_spinner</string> - <string>descriptionField</string> + <string>description_field</string> <string>preferences_controller</string> - <string>runTaskDialog</string> + <string>run_task_dialog</string> <string>show_status_window_checkbox</string> - <string>statusHudWindow</string> - <string>statusHudWindowText</string> - <string>taskField</string> + <string>status_hud_window</string> + <string>status_hud_window_text</string> + <string>task_field</string> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> English.lproj/MainMenu.nib/designable.nib English.lproj/MainMenu.nib/keyedobjects.nib @@ -9,7 +9,7 @@ require 'pathname' # Application own Settings APPNAME = "Macistrano" TARGET = "#{APPNAME}.app" -#APPVERSION = "rev#{`svn info`[/Revision: (\d+)/, 1]}" +APPVERSION = "0.1.0" APPVERSION = Time.now.strftime("%Y-%m-%d") PUBLISH = 'yourname@yourhost:path' DEFAULT_TARGET = 'macistrano' Rakefile @@ -1,10 +1,13 @@ -+ Poll stage build status regularly -+ Mark stage build status in status bar -+ Add HTTP timeouts -* Set check cycle +* Add HTTP timeouts * Set default timeout -+ Add growl notifications -+ Open preferences when no hosts configured -* Floating window to watch deployment status * Display notification when a host is not reachable, or throws an error, then disable it, but recheck it on every run, and don't display a notification when it's still failing -* Update changed project data in the menu \ No newline at end of file +* Update changed project data in the menu, project refresh + +Done: + +* Floating window to watch deployment status +* Set check cycle +* Mark stage build status in status bar +* Poll stage build status regularly +* Open preferences when no hosts configured +* Add growl notifications TODO @@ -30,12 +30,12 @@ class ProjectController < OSX::NSWindowController attr_reader :status_menu, :webistrano_controller attr_accessor :loaded, :growl_notifier - ib_outlet :runTaskDialog - ib_outlet :taskField - ib_outlet :descriptionField + ib_outlet :run_task_dialog + ib_outlet :task_field + ib_outlet :description_field ib_outlet :preferences_controller - ib_outlet :statusHudWindow - ib_outlet :statusHudWindowText + ib_outlet :status_hud_window + ib_outlet :status_hud_window_text ib_outlet :show_status_window_checkbox ib_outlet :deployment_status_spinner @@ -44,7 +44,7 @@ class ProjectController < OSX::NSWindowController end ib_action :show_status do - @statusHudWindow.makeKeyAndOrderFront(self) + @status_hud_window.makeKeyAndOrderFront(self) end def awakeFromNib @@ -54,7 +54,7 @@ class ProjectController < OSX::NSWindowController webistrano_controller.hosts = @preferences_controller.hosts create_status_bar init_growl - @statusHudWindow.setFloatingPanel true + @status_hud_window.setFloatingPanel true end def init_growl @@ -108,7 +108,7 @@ class ProjectController < OSX::NSWindowController end def update_status_window(notification) - @statusHudWindowText.setStringValue notification.object.log + @status_hud_window_text.setStringValue notification.object.log end def build_completed(notification) @@ -152,12 +152,12 @@ class ProjectController < OSX::NSWindowController def clicked(sender) @selected_stage = sender.representedObject.stage - @taskField.setStringValue sender.representedObject.name - NSApp.activateIgnoringOtherApps true - @runTaskDialog.makeFirstResponder @descriptionField - @runTaskDialog.setTitle("Run Task") - @runTaskDialog.makeKeyAndOrderFront(self) - @runTaskDialog.center + @task_field.setStringValue(sender.representedObject.name) + NSApp.activateIgnoringOtherApps(true) + @run_task_dialog.makeFirstResponder(@description_field) + @run_task_dialog.setTitle("Run Task") + @run_task_dialog.makeKeyAndOrderFront(self) + @run_task_dialog.center end def add_projects(notification) @@ -169,25 +169,26 @@ class ProjectController < OSX::NSWindowController end end - ib_action :runTask do - taskName = @taskField.stringValue.to_s - description = @descriptionField.stringValue.to_s + def run_task(sender = nil) + taskName = @task_field.stringValue.to_s + description = @description_field.stringValue.to_s @selected_stage.run_stage taskName, description case @show_status_window_checkbox.state.to_i when 1: show_status when 0: - @statusHudWindow.close + @status_hud_window.close end - @runTaskDialog.close + @run_task_dialog.close webistrano_controller.setup_one_time_deployment_status_timer @deployment_status_spinner.startAnimation(self) - @statusHudWindowText.setStringValue("") + @status_hud_window_text.setStringValue("") reset_fields end + ib_action :run_task ib_action :closeTaskWindow do - @runTaskDialog.close + @run_task_dialog.close reset_fields end @@ -228,8 +229,8 @@ class ProjectController < OSX::NSWindowController private def reset_fields - @taskField.setStringValue "" - @descriptionField.setStringValue "" + @task_field.setStringValue "" + @description_field.setStringValue "" end def create_status_bar controller/project_controller.rb @@ -45,20 +45,20 @@ describe ProjectController, "when running a task" do before(:each) do @controller = ProjectController.alloc.init @task_field = stub(:task_field, :stringValue => "deploy", :setStringValue => "") - @controller.instance_variable_set(:@taskField, @task_field) + @controller.instance_variable_set(:@task_field, @task_field) @description_field = stub(:description_field, :stringValue => "Chunky bacon", :setStringValue => "") - @controller.instance_variable_set(:@descriptionField, @description_field) + @controller.instance_variable_set(:@description_field, @description_field) @stage = Stage.alloc.init @stage.stub!(:run_stage) @controller.instance_variable_set(:@selected_stage, @stage) @status_window_checkbox = stub(:show_status_window_checkbox, :state => "1") @controller.instance_variable_set(:@show_status_window_checkbox, @status_window_checkbox) @status_window = stub(:status_window, :makeKeyAndOrderFront => nil) - @controller.instance_variable_set(:@statusHudWindow, @status_window) + @controller.instance_variable_set(:@status_hud_window, @status_window) @run_task_dialog = stub(:run_task_dialog, :close => nil) - @controller.instance_variable_set(:@runTaskDialog, @run_task_dialog) + @controller.instance_variable_set(:@run_task_dialog, @run_task_dialog) @status_window_text = stub(:status_window_text, :setStringValue => nil) - @controller.instance_variable_set(:@statusHudWindowText, @status_window_text) + @controller.instance_variable_set(:@status_hud_window_text, @status_window_text) @webistrano_controller = WebistranoController.alloc.init @controller.instance_variable_set(:@webistrano_controller, @webistrano_controller) @deployment_status_spinner = stub(:deployment_status_spinner, :startAnimation => nil) @@ -67,44 +67,44 @@ describe ProjectController, "when running a task" do it "should run the selected stage" do @stage.should_receive(:run_stage).with("deploy", "Chunky bacon") - @controller.runTask + @controller.run_task end it "should show the status window if box is checked" do @status_window.should_receive(:makeKeyAndOrderFront).with(@controller) - @controller.runTask + @controller.run_task end it "should close the status window if box is not checked" do @status_window_checkbox.stub!(:state).and_return "0" @status_window.should_receive(:close) - @controller.runTask + @controller.run_task end it "should close the run task dialog" do @run_task_dialog.should_receive(:close) - @controller.runTask + @controller.run_task end it "should reset the text fields" do @task_field.should_receive(:setStringValue).with("") @description_field.should_receive(:setStringValue).with("") - @controller.runTask + @controller.run_task end it "should notify of running build" do @webistrano_controller.should_receive(:setup_one_time_deployment_status_timer) - @controller.runTask + @controller.run_task end it "should reset the status window" do @status_window_text.should_receive(:setStringValue).with("") - @controller.runTask + @controller.run_task end it "should activate the progress indicator" do @deployment_status_spinner.should_receive(:startAnimation) - @controller.runTask + @controller.run_task end end @@ -115,7 +115,7 @@ describe ProjectController, "when awaking from nib" do @preferences_controller = stub(:preferences, :hosts => [@host]) @controller.instance_variable_set(:@preferences_controller, @preferences_controller) @status_window = stub(:status_window, :setFloatingPanel => true) - @controller.instance_variable_set(:@statusHudWindow, @status_window) + @controller.instance_variable_set(:@status_hud_window, @status_window) end it "should open the preference pane if no hosts are configured" do spec/project_controller_spec.rb 80c40e511c5c0a1b8af099c92a48f2b240e80d4b Mathias Meyer meyer@paperplanes.de http://github.com/mattmatt/macistrano/commit/e332f415a07995ec1fd53dd212e711ee528e0b96 e332f415a07995ec1fd53dd212e711ee528e0b96 2009-01-21T14:39:36-08:00 2009-01-21T14:39:36-08:00 Made the controller stuff slightly more Ruby-like. 2cc29a8afa4c0663bc7d0fc04db7355923e71b9e Mathias Meyer meyer@paperplanes.de