Permalink
Browse files

Merge branch 'experimental'

  • Loading branch information...
2 parents 6d32aca + 2b006dd commit 34280eeea9fd7666e5364fdc3ff77ee78a339401 @Manfred Manfred committed Mar 9, 2011
Showing with 8,326 additions and 14,755 deletions.
  1. +6 −1 .gitignore
  2. +35 −0 .kick
  3. BIN English.lproj/InfoPlist.strings
  4. +563 −1,044 English.lproj/PassengerPref.xib
  5. +14 −14 Info.plist
  6. +53 −2 LICENSE
  7. +397 −90 Passenger.xcodeproj/project.pbxproj
  8. +7 −0 Passenger.xcodeproj/project.xcworkspace/contents.xcworkspacedata
  9. +32 −0 PassengerTest-Info.plist
  10. +7 −0 PassengerTest-Prefix.pch
  11. +4 −4 Passenger_Prefix.pch
  12. +50 −48 Rakefile
  13. +0 −9 app/config/passenger_pane_config.rb
  14. +0 −9 app/config/passenger_pane_config.rb.ports
  15. +53 −0 app/controllers/PassengerPref.h
  16. +288 −8 app/controllers/PassengerPref.m
  17. +0 −332 app/controllers/passenger_pref.rb
  18. +37 −0 app/models/Application.h
  19. +137 −0 app/models/Application.m
  20. +0 −286 app/models/passenger_application.rb
  21. +0 −96 app/scripts/config_installer.rb
  22. +0 −55 app/scripts/config_uninstaller.rb
  23. +0 −30 app/scripts/hosts_installer.rb
  24. +39 −0 app/utils/CLI.h
  25. +190 −0 app/utils/CLI.m
  26. +9 −0 app/utils/Common.h
  27. +0 −10 app/utils/HelpHelper.h
  28. +0 −21 app/utils/HelpHelper.m
  29. +0 −14 app/utils/SecurityHelper.h
  30. +0 −81 app/utils/SecurityHelper.m
  31. +0 −28 app/utils/shared_passenger_behaviour.rb
  32. +10 −0 bin/ppane
  33. +30 −0 doc/DEVELOPMENT
  34. +2 −6 doc/TODO
  35. +2 −0 en.lproj/InfoPlist.strings
  36. +62 −0 lib/crock.rb
  37. +28 −0 lib/option_parser.rb
  38. +9 −0 lib/passenger_pane.rb
  39. +219 −0 lib/passenger_pane/application.rb
  40. +54 −0 lib/passenger_pane/configuration.rb
  41. +19 −0 lib/passenger_pane/directory_services.rb
  42. +66 −0 lib/passenger_pane/httpd_conf.rb
  43. +176 −0 lib/passenger_pane/runner.rb
  44. +7 −0 lib/passenger_pane/trust.rb
  45. +25 −0 ppane.gemspec
  46. +0 −5,680 resources/Security.bridgesupport
  47. 0 test/{ → attic}/config_installer_test.rb
  48. 0 test/{ → attic}/config_uninstaller_test.rb
  49. 0 test/{ → attic}/fixtures/blog.vhost.conf
  50. 0 test/{ → attic}/fixtures/franky.vhost.conf
  51. 0 test/{ → attic}/fixtures/staging.vhost.conf
  52. 0 test/{ → attic}/fixtures/wiki.vhost.conf
  53. 0 test/{ → attic}/hosts_installer_test.rb
  54. 0 test/{ → attic}/passenger_application_test.rb
  55. 0 test/{ → attic}/passenger_pref_test.rb
  56. 0 test/{ → attic}/shared_passenger_behaviour_test.rb
  57. 0 test/{ → attic}/test_helper.rb
  58. +19 −0 test/passenger_pane/NuBacon/LICENSE
  59. +305 −0 test/passenger_pane/NuBacon/README.md
  60. +7 −0 test/passenger_pane/NuBacon/TODO
  61. +94 −0 test/passenger_pane/NuBacon/bacon.nu
  62. +108 −0 test/passenger_pane/NuBacon/bacon_context.nu
  63. +103 −0 test/passenger_pane/NuBacon/bacon_macros.nu
  64. +227 −0 test/passenger_pane/NuBacon/bacon_should.nu
  65. +437 −0 test/passenger_pane/NuBacon/bacon_spec.nu
  66. +111 −0 test/passenger_pane/NuBacon/bacon_specification.nu
  67. +61 −0 test/passenger_pane/NuBacon/bacon_summary.nu
  68. +56 −0 test/passenger_pane/NuBacon/readme_spec.nu
  69. +169 −0 test/passenger_pane/application_test.nu
  70. +62 −0 test/passenger_pane/cli_test.nu
  71. +19 −0 test/passenger_pane/fake_ppane/ppane
  72. +10 −0 test/passenger_pane/test_helper.nu
  73. +255 −0 test/ppane/application_test.rb
  74. +35 −0 test/ppane/configuration_test.rb
  75. +25 −0 test/ppane/directory_services_test.rb
  76. +509 −0 test/ppane/fake/etc/apache2/httpd.conf
  77. +10 −0 test/ppane/fake/etc/apache2/passenger_pane_vhosts/blog.vhost.conf
  78. +9 −0 test/ppane/fake/etc/apache2/passenger_pane_vhosts/franky.vhost.conf
  79. +9 −0 test/ppane/fake/etc/apache2/passenger_pane_vhosts/noenv.vhost.conf
  80. +9 −0 test/ppane/fake/etc/apache2/passenger_pane_vhosts/staging.vhost.conf
  81. +12 −0 test/ppane/fake/etc/apache2/passenger_pane_vhosts/wiki.vhost.conf
  82. +143 −0 test/ppane/httpd_conf_test.rb
  83. +141 −0 test/ppane/runner_test.rb
  84. +28 −0 test/ppane/test_helper.rb
  85. +63 −0 test/ppane/test_helper/add_allow_switch.rb
  86. +151 −0 test/ppane/test_helper/add_allow_switch_test.rb
  87. +27 −0 test/ppane/test_helper/capture_output.rb
  88. +15 −0 test/ppane/test_helper/collector.rb
  89. +15 −0 test/ppane/test_helper/fake_apache_directory.rb
  90. +23 −0 test/ppane/test_helper/temporary_directory.rb
  91. +0 −1 vendor/RubyCocoa.framework/Headers
  92. +0 −1 vendor/RubyCocoa.framework/Resources
  93. +0 −1 vendor/RubyCocoa.framework/RubyCocoa
  94. +0 −38 vendor/RubyCocoa.framework/Versions/A/Headers/RBObject.h
  95. +0 −58 vendor/RubyCocoa.framework/Versions/A/Headers/RBRuntime.h
  96. +0 −31 vendor/RubyCocoa.framework/Versions/A/Headers/RubyCocoa.h
  97. +0 −507 vendor/RubyCocoa.framework/Versions/A/Headers/osx_intern.h
  98. +0 −772 vendor/RubyCocoa.framework/Versions/A/Headers/osx_ruby.h
  99. +0 −28 vendor/RubyCocoa.framework/Versions/A/Resources/Info.plist
  100. +0 −9 vendor/RubyCocoa.framework/Versions/A/Resources/ruby/osx/active_record.rb
  101. +0 −11 vendor/RubyCocoa.framework/Versions/A/Resources/ruby/osx/addressbook.rb
  102. +0 −9 vendor/RubyCocoa.framework/Versions/A/Resources/ruby/osx/appkit.rb
  103. +0 −8 vendor/RubyCocoa.framework/Versions/A/Resources/ruby/osx/cocoa.rb
  104. +0 −11 vendor/RubyCocoa.framework/Versions/A/Resources/ruby/osx/coredata.rb
  105. +0 −458 vendor/RubyCocoa.framework/Versions/A/Resources/ruby/osx/objc/active_record.rb
  106. +0 −37 vendor/RubyCocoa.framework/Versions/A/Resources/ruby/osx/objc/application.rb
  107. +0 −14 vendor/RubyCocoa.framework/Versions/A/Resources/ruby/osx/objc/cocoa.rb
  108. +0 −124 vendor/RubyCocoa.framework/Versions/A/Resources/ruby/osx/objc/cocoa_macros.rb
  109. +0 −42 vendor/RubyCocoa.framework/Versions/A/Resources/ruby/osx/objc/cocoa_macros_appkit.rb
  110. +0 −18 vendor/RubyCocoa.framework/Versions/A/Resources/ruby/osx/objc/foundation.rb
  111. +0 −14 vendor/RubyCocoa.framework/Versions/A/Resources/ruby/osx/objc/oc_all.rb
  112. +0 −2,385 vendor/RubyCocoa.framework/Versions/A/Resources/ruby/osx/objc/oc_attachments.rb
  113. +0 −21 vendor/RubyCocoa.framework/Versions/A/Resources/ruby/osx/objc/oc_attachments_appkit.rb
  114. +0 −53 vendor/RubyCocoa.framework/Versions/A/Resources/ruby/osx/objc/oc_bundle_support.rb
  115. +0 −35 vendor/RubyCocoa.framework/Versions/A/Resources/ruby/osx/objc/oc_exception.rb
  116. +0 −792 vendor/RubyCocoa.framework/Versions/A/Resources/ruby/osx/objc/oc_import.rb
  117. +0 −91 vendor/RubyCocoa.framework/Versions/A/Resources/ruby/osx/objc/oc_types.rb
  118. +0 −66 vendor/RubyCocoa.framework/Versions/A/Resources/ruby/osx/objc/oc_types_appkit.rb
  119. +0 −150 vendor/RubyCocoa.framework/Versions/A/Resources/ruby/osx/objc/oc_wrapper.rb
  120. +0 −113 vendor/RubyCocoa.framework/Versions/A/Resources/ruby/osx/objc/ruby_addition.rb
  121. +0 −11 vendor/RubyCocoa.framework/Versions/A/Resources/ruby/osx/qtkit.rb
  122. +0 −11 vendor/RubyCocoa.framework/Versions/A/Resources/ruby/osx/webkit.rb
  123. BIN vendor/RubyCocoa.framework/Versions/A/RubyCocoa
  124. +0 −122 vendor/RubyCocoa.framework/Versions/A/Tools/gen_bridge_doc.rb
  125. +0 −443 vendor/RubyCocoa.framework/Versions/A/Tools/rb_nibtool.rb
  126. +0 −401 vendor/RubyCocoa.framework/Versions/A/Tools/standaloneify.rb
  127. +0 −1 vendor/RubyCocoa.framework/Versions/Current
  128. +71 −0 vendor/TouchJSON/CDataScanner.h
  129. +340 −0 vendor/TouchJSON/CDataScanner.m
  130. +25 −0 vendor/TouchJSON/Experimental/CFilteringJSONSerializer.h
  131. +87 −0 vendor/TouchJSON/Experimental/CFilteringJSONSerializer.m
  132. +16 −0 vendor/TouchJSON/Experimental/CJSONDeserializer_BlocksExtensions.h
  133. +63 −0 vendor/TouchJSON/Experimental/CJSONDeserializer_BlocksExtensions.m
  134. +34 −0 vendor/TouchJSON/Experimental/CJSONSerialization.h
  135. +59 −0 vendor/TouchJSON/Experimental/CJSONSerialization.m
  136. +25 −0 vendor/TouchJSON/Experimental/CJSONSerializedData.h
  137. +42 −0 vendor/TouchJSON/Experimental/CJSONSerializedData.m
  138. +40 −0 vendor/TouchJSON/Extensions/CDataScanner_Extensions.h
  139. +135 −0 vendor/TouchJSON/Extensions/CDataScanner_Extensions.m
  140. +37 −0 vendor/TouchJSON/Extensions/NSDictionary_JSONExtensions.h
  141. +47 −0 vendor/TouchJSON/Extensions/NSDictionary_JSONExtensions.m
  142. +63 −0 vendor/TouchJSON/JSON/CJSONDeserializer.h
  143. +161 −0 vendor/TouchJSON/JSON/CJSONDeserializer.m
  144. +95 −0 vendor/TouchJSON/JSON/CJSONScanner.h
  145. +676 −0 vendor/TouchJSON/JSON/CJSONScanner.m
  146. +53 −0 vendor/TouchJSON/JSON/CJSONSerializer.h
  147. +342 −0 vendor/TouchJSON/JSON/CJSONSerializer.m
  148. +18 −0 vendor/TouchJSON/JSON/JSONRepresentation.h
View
@@ -2,4 +2,9 @@ build
.DS_Store
Passenger.xcodeproj/*.mode1v3
Passenger.xcodeproj/*.pbxuser
-pkg
+pkg
+tmp
+Passenger.xcodeproj/project.xcworkspace/xcuserdata/*
+Passenger.xcodeproj/xcuserdata/*
+*.gem
+test/passenger_pane/PassengerTest.framework
View
35 .kick
@@ -0,0 +1,35 @@
+recipe :ignore
+ignore(/^(tmp|Passenger.xcodeproj)/)
+
+recipe :ruby
+
+module Nu
+ def self.run_tests(files)
+ test_directory = File.expand_path('../test/passenger_pane', __FILE__)
+ files.each do |file|
+ if File.exist?(File.join(test_directory, file))
+ execute "cd #{test_directory}; /usr/local/bin/nush #{file}"
+ end
+ end
+ end
+end
+
+process do |files|
+ Ruby.run_tests(files.take_and_map do |file|
+ case file
+ when %r{^test/ppane/test_helper/add_allow_switch.rb$}
+ 'test/ppane/test_helper/add_allow_switch_test.rb'
+ end
+ end)
+
+ Nu.run_tests(files.take_and_map do |file|
+ case file
+ when %r{^app/.*\.[mh]$}
+ filename = File.basename(file.downcase)
+ parts = filename.split('.')
+ "#{parts[0..-2]}_test.nu"
+ when %r{^test/passenger_pane/.*_test\.nu$}
+ File.basename(file)
+ end
+ end)
+end
Binary file not shown.

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -6,6 +6,10 @@
<string>English</string>
<key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string>
+ <key>CFBundleHelpBookFolder</key>
+ <string>PassengerPaneHelp</string>
+ <key>CFBundleHelpBookName</key>
+ <string>PassengerPaneHelp</string>
<key>CFBundleIconFile</key>
<string></string>
<key>CFBundleIdentifier</key>
@@ -24,24 +28,20 @@
<string>1.5</string>
<key>NSMainNibFile</key>
<string>PassengerPref</string>
+ <key>NSPrefPaneHelpAnchors</key>
+ <array>
+ <dict>
+ <key>anchor</key>
+ <string>main_passenger_help</string>
+ <key>title</key>
+ <string>Passenger Preferences Help</string>
+ </dict>
+ </array>
<key>NSPrefPaneIconFile</key>
<string>PassengerPref.icns</string>
<key>NSPrefPaneIconLabel</key>
<string>Passenger</string>
<key>NSPrincipalClass</key>
- <string>PrefPanePassenger</string>
- <key>CFBundleHelpBookFolder</key>
- <string>PassengerPaneHelp</string>
- <key>CFBundleHelpBookName</key>
- <string>PassengerPaneHelp</string>
- <key>NSPrefPaneHelpAnchors</key>
- <array>
- <dict>
- <key>title</key>
- <string>Passenger Preferences Help</string>
- <key>anchor</key>
- <string>main_passenger_help</string>
- </dict>
- </array>
+ <string>PassengerPref</string>
</dict>
</plist>
View
55 LICENSE
@@ -1,6 +1,57 @@
-Copyright © 2008-2009, Fingertips, http://www.fngtps.com,
+Copyright © 2008-2010, Fingertips, http://www.fngtps.com,
Eloy Duran <eloy@fngtps.com>,
- Thijs van der Vossen <thijs@fngtps.com>
+ Thijs van der Vossen <thijs@fngtps.com>,
+ Manfred Stienstra <manfred@fngtps.com>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+The Passenger Preference Pane ships with external libraries some require us
+to copy their license:
+
+TouchJSON
+
+Copyright (c) 2008 Jonathan Wight
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+NuBacon
+
+Copyright (C) 2010 Eloy Durán <eloy.de.enige@gmail.com>, Fingertips BV <fngtps.com>
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Oops, something went wrong.

0 comments on commit 34280ee

Please sign in to comment.