icon-failed.png model/growl_support.rb @@ -673,6 +673,7 @@ <int key="NSvFlags">274</int> <string key="NSFrame">{{20, 44}, {531, 263}}</string> <reference key="NSSuperview" ref="84330098"/> + <double key="NSViewAlphaValue">0.000000e+00</double> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="2967395"> <int key="NSCellFlags">-2079195584</int> @@ -689,7 +690,7 @@ <int key="NSColorSpace">1</int> <bytes key="NSRGB">MCAwIDAgMC43NQA</bytes> </object> - <object class="NSColor" key="NSTextColor"> + <object class="NSColor" key="NSTextColor" id="949216260"> <int key="NSColorSpace">1</int> <bytes key="NSRGB">MSAxIDEAA</bytes> </object> @@ -699,7 +700,7 @@ <reference key="NSNextResponder" ref="84330098"/> <int key="NSvFlags">1292</int> <object class="NSPSMatrix" key="NSDrawMatrix"/> - <string key="NSFrame">{{20, 20}, {99, 12}}</string> + <string key="NSFrame">{{20, 20}, {74, 12}}</string> <reference key="NSSuperview" ref="84330098"/> <int key="NSpiFlags">24842</int> <double key="NSMinValue">1.600000e+01</double> @@ -1480,6 +1481,10 @@ <string>515.IBPluginDependency</string> <string>516.IBPluginDependency</string> <string>518.IBPluginDependency</string> + <string>518.IBViewIntegration.shadowBlurRadius</string> + <string>518.IBViewIntegration.shadowColor</string> + <string>518.IBViewIntegration.shadowOffsetHeight</string> + <string>518.IBViewIntegration.shadowOffsetWidth</string> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -1487,9 +1492,9 @@ <string>com.apple.InterfaceBuilderKit</string> <string>com.apple.InterfaceBuilderKit</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{604, 354}, {285, 294}}</string> + <string>{{470, -846}, {285, 294}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{604, 354}, {285, 294}}</string> + <string>{{470, -846}, {285, 294}}</string> <integer value="0" id="6"/> <string>{{499, 593}, {285, 266}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -1505,9 +1510,9 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{476, 235}, {332, 396}}</string> + <string>{{342, -965}, {332, 396}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{476, 235}, {332, 396}}</string> + <string>{{342, -965}, {332, 396}}</string> <integer value="1" id="5"/> <string>{{497, 550}, {332, 396}}</string> <reference ref="6"/> @@ -1531,9 +1536,9 @@ <reference ref="5"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <reference ref="5"/> - <string>{{647, 562}, {371, 206}}</string> + <string>{{513, -638}, {371, 206}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{647, 562}, {371, 206}}</string> + <string>{{513, -638}, {371, 206}}</string> <reference ref="5"/> <string>{{120, 647}, {371, 206}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -1559,9 +1564,9 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <reference ref="5"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{418, 604}, {571, 327}}</string> + <string>{{255, -596}, {571, 327}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{418, 604}, {571, 327}}</string> + <string>{{255, -596}, {571, 327}}</string> <reference ref="6"/> <reference ref="5"/> <string>{571, 303}</string> @@ -1575,6 +1580,10 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <real value="4.000000e+00"/> + <reference ref="949216260"/> + <real value="0.000000e+00"/> + <real value="1.000000e+01"/> </object> </object> <object class="NSMutableDictionary" key="unlocalizedProperties"> English.lproj/MainMenu.nib/designable.nib English.lproj/MainMenu.nib/keyedobjects.nib @@ -8,18 +8,12 @@ require 'osx/cocoa' require 'rubygems' -require 'growl_notifier' require 'notification_hub' +require 'growl_support' class ProjectController < OSX::NSWindowController - include OSX - include NotificationHub - - GROWL_MESSAGE_TYPES = {:deployment_complete => "Deployment completed", - :deployment_started => "Deployment started", - :deployment_failed => "Deployment failed", - :deployment_canceled => "Deployment cancelled"} - + include OSX, NotificationHub, GrowlSupport + notify :add_host, :when => :host_fully_loaded notify :remove_host, :when => :host_removed notify :remove_loading, :when => :all_hosts_loaded @@ -57,11 +51,6 @@ class ProjectController < OSX::NSWindowController @status_hud_window.setFloatingPanel true end - def init_growl - @growl_notifier = Growl::Notifier.alloc.init - @growl_notifier.start('Macistrano', GROWL_MESSAGE_TYPES.collect {|key, value| value}) - end - def remove_loading(notification) item = @statusItem.menu.itemWithTitle("Loading...") @statusItem.menu.removeItem(item) unless item.nil? @@ -112,27 +101,13 @@ class ProjectController < OSX::NSWindowController end def build_completed(notification) - icon = case notification.object.status - when "success": - notify_growl GROWL_MESSAGE_TYPES[:deployment_complete], notification.object - "success" - when "canceled": - notify_growl GROWL_MESSAGE_TYPES[:deployment_canceled], notification.object - "canceled" - when "failed": - notify_growl GROWL_MESSAGE_TYPES[:deployment_failed], notification.object - "failure" - end - set_stage_submenu_enabled(notification.object, true, icon) - set_status_icon icon + set_stage_submenu_enabled(notification.object, true, notification.object.status) + set_status_icon(notification.object.status) + notify_growl(notification) @webistrano_controller.remove_deployment_timer(notification) @deployment_status_spinner.stopAnimation(self) end - def notify_growl(message, deployment) - @growl_notifier.notify(message, message, "Stage #{deployment.stage.name} of project #{deployment.stage.project.name} (Host: #{deployment.stage.project.host.url})") - end - def set_status_icon(icon) @statusItem.setImage get_icon(icon) end controller/project_controller.rb @@ -19,7 +19,7 @@ FE3CB0830E902DF8009138A1 /* macistrano.icns in Resources */ = {isa = PBXBuildFile; fileRef = FE3CB0820E902DF8009138A1 /* macistrano.icns */; }; FE517D860DDF2B5B00CA0249 /* load_operation_queue.rb in Resources */ = {isa = PBXBuildFile; fileRef = FE517D850DDF2B5B00CA0249 /* load_operation_queue.rb */; }; FE5F03D90DC11830009DA75F /* webistrano_controller.rb in Resources */ = {isa = PBXBuildFile; fileRef = FE5F03D80DC11830009DA75F /* webistrano_controller.rb */; }; - FE5F041F0DC11D5B009DA75F /* icon-failure.png in Resources */ = {isa = PBXBuildFile; fileRef = FE5F041E0DC11D5B009DA75F /* icon-failure.png */; }; + FE5F041F0DC11D5B009DA75F /* icon-failed.png in Resources */ = {isa = PBXBuildFile; fileRef = FE5F041E0DC11D5B009DA75F /* icon-failed.png */; }; FE5F04210DC11D6A009DA75F /* icon-inactive.png in Resources */ = {isa = PBXBuildFile; fileRef = FE5F04200DC11D6A009DA75F /* icon-inactive.png */; }; FE5F04240DC11D75009DA75F /* icon-success-building.png in Resources */ = {isa = PBXBuildFile; fileRef = FE5F04220DC11D75009DA75F /* icon-success-building.png */; }; FE5F04250DC11D75009DA75F /* icon-success.png in Resources */ = {isa = PBXBuildFile; fileRef = FE5F04230DC11D75009DA75F /* icon-success.png */; }; @@ -43,6 +43,7 @@ FEC9EB780DE099B900ABA9C8 /* project.rb in Resources */ = {isa = PBXBuildFile; fileRef = FEC9EB700DE099B900ABA9C8 /* project.rb */; }; FEC9EB790DE099B900ABA9C8 /* stage.rb in Resources */ = {isa = PBXBuildFile; fileRef = FEC9EB710DE099B900ABA9C8 /* stage.rb */; }; FEC9EB7A0DE099B900ABA9C8 /* task.rb in Resources */ = {isa = PBXBuildFile; fileRef = FEC9EB720DE099B900ABA9C8 /* task.rb */; }; + FEE6BA300F2879F700402101 /* growl_support.rb in Resources */ = {isa = PBXBuildFile; fileRef = FEE6BA2F0F2879F700402101 /* growl_support.rb */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -76,7 +77,7 @@ FE3CB0820E902DF8009138A1 /* macistrano.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = macistrano.icns; sourceTree = "<group>"; }; FE517D850DDF2B5B00CA0249 /* load_operation_queue.rb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.ruby; name = load_operation_queue.rb; path = model/load_operation_queue.rb; sourceTree = "<group>"; }; FE5F03D80DC11830009DA75F /* webistrano_controller.rb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.ruby; name = webistrano_controller.rb; path = controller/webistrano_controller.rb; sourceTree = "<group>"; }; - FE5F041E0DC11D5B009DA75F /* icon-failure.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icon-failure.png"; sourceTree = "<group>"; }; + FE5F041E0DC11D5B009DA75F /* icon-failed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icon-failed.png"; sourceTree = "<group>"; }; FE5F04200DC11D6A009DA75F /* icon-inactive.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icon-inactive.png"; sourceTree = "<group>"; }; FE5F04220DC11D75009DA75F /* icon-success-building.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icon-success-building.png"; sourceTree = "<group>"; }; FE5F04230DC11D75009DA75F /* icon-success.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icon-success.png"; sourceTree = "<group>"; }; @@ -103,6 +104,7 @@ FEC9EB700DE099B900ABA9C8 /* project.rb */ = {isa = PBXFileReference; fileEncoding = 7; lastKnownFileType = text.script.ruby; path = project.rb; sourceTree = "<group>"; }; FEC9EB710DE099B900ABA9C8 /* stage.rb */ = {isa = PBXFileReference; fileEncoding = 7; lastKnownFileType = text.script.ruby; path = stage.rb; sourceTree = "<group>"; }; FEC9EB720DE099B900ABA9C8 /* task.rb */ = {isa = PBXFileReference; fileEncoding = 7; lastKnownFileType = text.script.ruby; path = task.rb; sourceTree = "<group>"; }; + FEE6BA2F0F2879F700402101 /* growl_support.rb */ = {isa = PBXFileReference; fileEncoding = 7; lastKnownFileType = text.script.ruby; name = growl_support.rb; path = model/growl_support.rb; sourceTree = "<group>"; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -121,6 +123,7 @@ 080E96DDFE201D6D7F000001 /* Classes */ = { isa = PBXGroup; children = ( + FEE6BA2F0F2879F700402101 /* growl_support.rb */, FE33BD970DDDFB3D003ACBAA /* load_operation.rb */, FEA7AD5C0DDCB2E00032FE31 /* notification_hub.rb */, FE1191EB0DD89E120073164F /* task.rb */, @@ -195,7 +198,7 @@ FE5F04220DC11D75009DA75F /* icon-success-building.png */, FE5F04230DC11D75009DA75F /* icon-success.png */, FE5F04200DC11D6A009DA75F /* icon-inactive.png */, - FE5F041E0DC11D5B009DA75F /* icon-failure.png */, + FE5F041E0DC11D5B009DA75F /* icon-failed.png */, 29B97318FDCFA39411CA2CEA /* MainMenu.nib */, 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */, ); @@ -300,7 +303,7 @@ 4DDCA7080ACC9A6100E082CE /* rb_main.rb in Resources */, FEA7D49A0DC0F900001EFBE9 /* project_controller.rb in Resources */, FE5F03D90DC11830009DA75F /* webistrano_controller.rb in Resources */, - FE5F041F0DC11D5B009DA75F /* icon-failure.png in Resources */, + FE5F041F0DC11D5B009DA75F /* icon-failed.png in Resources */, FE5F04210DC11D6A009DA75F /* icon-inactive.png in Resources */, FE5F04240DC11D75009DA75F /* icon-success-building.png in Resources */, FE5F04250DC11D75009DA75F /* icon-success.png in Resources */, @@ -327,6 +330,7 @@ FE17B5B60E0D7E0600682156 /* growl_notifier.rb in Resources */, FE3CB0830E902DF8009138A1 /* macistrano.icns in Resources */, FE874BA70F27330600AE5935 /* icon-webistrano-small.png in Resources */, + FEE6BA300F2879F700402101 /* growl_support.rb in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; macistrano.xcodeproj/project.pbxproj @@ -138,8 +138,12 @@ describe ProjectController, "when notified of a completed build" do @controller.stub!(:set_stage_submenu_enabled) @controller.stub!(:set_status_icon) @deployment = Deployment.alloc.init + @deployment.stage = Stage.new + @deployment.stage.project = Project.new + @deployment.stage.project.host = Host.new @webistrano_controller = WebistranoController.alloc.init @controller.instance_variable_set(:@webistrano_controller, @webistrano_controller) + @controller.init_growl end it "should stop the spinner animation" do spec/project_controller_spec.rb icon-failure.png d6b283bba7873fd41f1eaa4145d9150d5ae41449 Mathias Meyer meyer@paperplanes.de http://github.com/mattmatt/macistrano/commit/d55cb1c1f271a9cc2fc9df4d33274ee8eb9413a3 d55cb1c1f271a9cc2fc9df4d33274ee8eb9413a3 2009-01-22T02:25:15-08:00 2009-01-22T02:25:15-08:00 Changed icon for failed deployments. Moved out growl code into separate module. c0de48fa79767502033b8b510ed757b517c58e2b Mathias Meyer meyer@paperplanes.de