Removing the last remnants of petegoo

antoinne85 · Feb 3, 2014 · 33239fe · 33239fe
1 parent 4b10c60
commit 33239fe
Show file tree

Hide file tree

Showing 16 changed files with 36 additions and 30 deletions.
diff --git a/MMBot.Core/Adapters/AdapterNotConfiguredException.cs b/MMBot.Core/Adapters/AdapterNotConfiguredException.cs
@@ -4,7 +4,7 @@ namespace MMBot
 {
     public class AdapterNotConfiguredException : Exception
     {
-        public AdapterNotConfiguredException() : base("You must configure the adapter first before you can use it. You can do this either via Environment variables or the config parameter. See http://github.com/PeteGoo/mmbot")
+        public AdapterNotConfiguredException() : base("You must configure the adapter first before you can use it. You can do this either via Environment variables or the config parameter. See http://github.com/mmbot/mmbot")
         {
 
         }

diff --git a/MMBot.Core/Properties/MMBot.Core.nuspec b/MMBot.Core/Properties/MMBot.Core.nuspec
@@ -5,8 +5,8 @@
     <version>0.9</version>
     <authors>Peter Goodman</authors>
     <owners>Peter Goodman</owners>
-    <licenseUrl>https://github.com/PeteGoo/mmbot/blob/master/LICENSE.md</licenseUrl>
-    <projectUrl>https://github.com/PeteGoo/mmbot/</projectUrl>
+    <licenseUrl>https://github.com/mmbot/mmbot/blob/master/LICENSE.md</licenseUrl>
+    <projectUrl>https://github.com/mmbot/mmbot/</projectUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>A C# port of Github's Hubot chat bot</description>
     <releaseNotes>Initial pre-release version.</releaseNotes>

diff --git a/MMBot.HipChat/HipChatAdapter.cs b/MMBot.HipChat/HipChatAdapter.cs
@@ -65,7 +65,7 @@ private void Configure() {
                 helpSb.AppendLine("  MMBOT_HIPCHAT_USERNAME: The username of the bot account on HipChat, e.g. 70126_494074");
                 helpSb.AppendLine("  MMBOT_HIPCHAT_PASSWORD: The password of the bot account on HipChat");
                 helpSb.AppendLine("  MMBOT_HIPCHAT_ROOMS: A comma separated list of room names that mmbot should join");
-                helpSb.AppendLine("More info on these values and how to create the mmbot.ini file can be found at https://github.com/PeteGoo/mmbot/wiki/Configuring-mmbot");
+                helpSb.AppendLine("More info on these values and how to create the mmbot.ini file can be found at https://github.com/mmbot/mmbot/wiki/Configuring-mmbot");
                 Logger.Warn(helpSb.ToString());
                 _isConfigured = false;
             }

diff --git a/MMBot.HipChat/Properties/MMBot.HipChat.nuspec b/MMBot.HipChat/Properties/MMBot.HipChat.nuspec
@@ -5,8 +5,8 @@
         <version>0.1.0</version>
         <authors>Peter Goodman</authors>
         <owners>Peter Goodman</owners>
-        <licenseUrl>https://github.com/PeteGoo/mmbot/blob/master/LICENSE.md</licenseUrl>
-        <projectUrl>https://github.com/PeteGoo/mmbot/</projectUrl>
+        <licenseUrl>https://github.com/mmbot/mmbot/blob/master/LICENSE.md</licenseUrl>
+        <projectUrl>https://github.com/mmbot/mmbot/</projectUrl>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <description>A HipChat Adapter for mmbot, a C# port of Github's Hubot chat bot</description>
         <releaseNotes>Initial pre-release version.</releaseNotes>

diff --git a/MMBot.Jabbr/JabbrAdapter.cs b/MMBot.Jabbr/JabbrAdapter.cs
@@ -47,7 +47,7 @@ private void Configure()
                 helpSb.AppendLine("  MMBOT_JABBR_NICK: The login name of the bot account on Jabbr, e.g. mmbot");
                 helpSb.AppendLine("  MMBOT_JABBR_PASSWORD: The password of the bot account on Jabbr");
                 helpSb.AppendLine("  MMBOT_JABBR_ROOMS: A comma separated list of room names that mmbot should join");
-                helpSb.AppendLine("More info on these values and how to create the mmbot.ini file can be found at https://github.com/PeteGoo/mmbot/wiki/Configuring-mmbot");
+                helpSb.AppendLine("More info on these values and how to create the mmbot.ini file can be found at https://github.com/mmbot/mmbot/wiki/Configuring-mmbot");
                 Logger.Warn(helpSb.ToString());
                 _isConfigured = false;
             }

diff --git a/MMBot.Jabbr/Properties/MMBot.Jabbr.nuspec b/MMBot.Jabbr/Properties/MMBot.Jabbr.nuspec
@@ -5,8 +5,8 @@
         <version>0.9</version>
         <authors>Peter Goodman</authors>
         <owners>Peter Goodman</owners>
-        <licenseUrl>https://github.com/PeteGoo/mmbot/blob/master/LICENSE.md</licenseUrl>
-        <projectUrl>https://github.com/PeteGoo/mmbot/</projectUrl>
+        <licenseUrl>https://github.com/mmbot/mmbot/blob/master/LICENSE.md</licenseUrl>
+        <projectUrl>https://github.com/mmbot/mmbot/</projectUrl>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <description>A Jabbr Adapter for mmbot, a C# port of Github's Hubot chat bot</description>
         <releaseNotes>Initial pre-release version.</releaseNotes>

diff --git a/MMBot.Router.Nancy/Properties/MMBot.Router.Nancy.nuspec b/MMBot.Router.Nancy/Properties/MMBot.Router.Nancy.nuspec
@@ -5,8 +5,8 @@
         <version>0.1.0</version>
         <authors>Peter Goodman</authors>
         <owners>Peter Goodman</owners>
-        <licenseUrl>https://github.com/PeteGoo/mmbot/blob/master/LICENSE.md</licenseUrl>
-        <projectUrl>https://github.com/PeteGoo/mmbot/</projectUrl>
+        <licenseUrl>https://github.com/mmbot/mmbot/blob/master/LICENSE.md</licenseUrl>
+        <projectUrl>https://github.com/mmbot/mmbot/</projectUrl>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <description>A Nancy Router implementation for mmbot, a C# port of Github's Hubot chat bot</description>
         <releaseNotes>Initial pre-release version.</releaseNotes>

diff --git a/MMBot.ScriptIt/Properties/MMBot.ScriptIt.nuspec b/MMBot.ScriptIt/Properties/MMBot.ScriptIt.nuspec
@@ -5,8 +5,8 @@
         <version>0.9</version>
         <authors>Damian Karzon</authors>
         <owners>Damian Karzon</owners>
-        <licenseUrl>https://github.com/PeteGoo/mmbot/blob/master/LICENSE.md</licenseUrl>
-        <projectUrl>https://github.com/PeteGoo/mmbot/</projectUrl>
+        <licenseUrl>https://github.com/mmbot/mmbot/blob/master/LICENSE.md</licenseUrl>
+        <projectUrl>https://github.com/mmbot/mmbot/</projectUrl>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <description>An script for mmbot that can execute scripts on the fly from messages or gists</description>
         <releaseNotes>Initial pre-release version.</releaseNotes>

diff --git a/MMBot.Spotify/Properties/MMBot.Spotify.nuspec b/MMBot.Spotify/Properties/MMBot.Spotify.nuspec
@@ -5,8 +5,8 @@
         <version>0.9</version>
         <authors>Peter Goodman</authors>
         <owners>Peter Goodman</owners>
-        <licenseUrl>https://github.com/PeteGoo/mmbot/blob/master/LICENSE.md</licenseUrl>
-        <projectUrl>https://github.com/PeteGoo/mmbot/</projectUrl>
+        <licenseUrl>https://github.com/mmbot/mmbot/blob/master/LICENSE.md</licenseUrl>
+        <projectUrl>https://github.com/mmbot/mmbot/</projectUrl>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <description>A set of scripts for mmbot that can play and queue tracks from spotify through the local speakers</description>
         <releaseNotes>Initial pre-release version.</releaseNotes>

diff --git a/MMBot.Tests/Resources.resx b/MMBot.Tests/Resources.resx
@@ -144,7 +144,7 @@
             ],
             "removed": [],
             "timestamp": "2013-12-31T04:50:37-08:00",
-            "url": "https://github.com/PeteGoo/mmbot/commit/35ffdc2fbe1bf6caf3fdf099bbb4e432b8cd20e1"
+            "url": "https://github.com/mmbot/mmbot/commit/35ffdc2fbe1bf6caf3fdf099bbb4e432b8cd20e1"
         },
         {
             "added": [
@@ -175,7 +175,7 @@
                 "MMBot.Core/Extensions/ExtensionMethos.cs"
             ],
             "timestamp": "2013-12-31T22:24:43-08:00",
-            "url": "https://github.com/PeteGoo/mmbot/commit/bedcec7ad4791e6d5da3b1273f39006916362d56"
+            "url": "https://github.com/mmbot/mmbot/commit/bedcec7ad4791e6d5da3b1273f39006916362d56"
         },
         {
             "added": [
@@ -228,10 +228,10 @@
             ],
             "removed": [],
             "timestamp": "2014-01-01T01:30:52-08:00",
-            "url": "https://github.com/PeteGoo/mmbot/commit/76c6c2e28e4833cf2524a4b5730132940a2e05af"
+            "url": "https://github.com/mmbot/mmbot/commit/76c6c2e28e4833cf2524a4b5730132940a2e05af"
         }
     ],
-    "compare": "https://github.com/PeteGoo/mmbot/compare/d979f44796e7...76c6c2e28e48",
+    "compare": "https://github.com/mmbot/mmbot/compare/d979f44796e7...76c6c2e28e48",
     "created": false,
     "deleted": false,
     "forced": false,
@@ -286,7 +286,7 @@
         ],
         "removed": [],
         "timestamp": "2014-01-01T01:30:52-08:00",
-        "url": "https://github.com/PeteGoo/mmbot/commit/76c6c2e28e4833cf2524a4b5730132940a2e05af"
+        "url": "https://github.com/mmbot/mmbot/commit/76c6c2e28e4833cf2524a4b5730132940a2e05af"
     },
     "pusher": {
         "name": "none"
@@ -313,7 +313,7 @@
         "pushed_at": 1388579605,
         "size": 7582,
         "stargazers": 42,
-        "url": "https://github.com/PeteGoo/mmbot",
+        "url": "https://github.com/mmbot/mmbot",
         "watchers": 42
     }
 }</value>

diff --git a/MMBot.XMPP/Properties/MMBot.XMPP.nuspec b/MMBot.XMPP/Properties/MMBot.XMPP.nuspec
@@ -5,8 +5,8 @@
         <version>0.9</version>
         <authors>Peter Goodman</authors>
         <owners>Peter Goodman</owners>
-        <licenseUrl>https://github.com/PeteGoo/mmbot/blob/master/LICENSE.md</licenseUrl>
-        <projectUrl>https://github.com/PeteGoo/mmbot/</projectUrl>
+        <licenseUrl>https://github.com/mmbot/mmbot/blob/master/LICENSE.md</licenseUrl>
+        <projectUrl>https://github.com/mmbot/mmbot/</projectUrl>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <description>An XMPP Adapter for mmbot, a C# port of Github's Hubot chat bot</description>
         <releaseNotes>Initial pre-release version.</releaseNotes>

diff --git a/MMBot.XMPP/XmppAdapter.cs b/MMBot.XMPP/XmppAdapter.cs
@@ -69,7 +69,7 @@ private void Configure()
                 helpSb.AppendLine("  MMBOT_XMPP_PASSWORD - the password");
                 helpSb.AppendLine("  MMBOT_XMPP_CONFERENCE_SERVER - a conference server to use when connecting to rooms");
                 helpSb.AppendLine("  MMBOT_XMPP_ROOMS - A comma separated list of room names that mmbot should join");
-                helpSb.AppendLine( "More info on these values and how to create the mmbot.ini file can be found at https://github.com/PeteGoo/mmbot/wiki/Configuring-mmbot");
+                helpSb.AppendLine( "More info on these values and how to create the mmbot.ini file can be found at https://github.com/mmbot/mmbot/wiki/Configuring-mmbot");
                 Logger.Warn(helpSb.ToString());
                 _isConfigured = false;
             }

diff --git a/ScriptCs.MMBot/Properties/ScriptCs.MMBot.nuspec b/ScriptCs.MMBot/Properties/ScriptCs.MMBot.nuspec
@@ -5,8 +5,8 @@
     <version>0.1.0</version>
     <authors>Peter Goodman</authors>
     <owners>Peter Goodman</owners>
-    <licenseUrl>https://github.com/PeteGoo/mmbot/blob/master/LICENSE.md</licenseUrl>
-    <projectUrl>https://github.com/PeteGoo/mmbot/</projectUrl>
+    <licenseUrl>https://github.com/mmbot/mmbot/blob/master/LICENSE.md</licenseUrl>
+    <projectUrl>https://github.com/mmbot/mmbot/</projectUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>A ScriptCs Script Pack for mmbot, a C# port of Github's Hubot chat bot</description>
     <releaseNotes>Initial pre-release version.</releaseNotes>

diff --git a/mmbot/Options.cs b/mmbot/Options.cs
@@ -38,6 +38,8 @@ public class Options
         [ParserState]
         public IParserState LastParserState { get; set; }
 
+        public bool ShowHelp { get; set; }
+
 
         [OptionArray('p', "parameters", HelpText = "A list of configuration parameters and their values e.g. -p PARAM1=VALUE1 PARAM2=VALUE2", DefaultValue = new string[0])]
         public string[] Parameters { get; set; }
@@ -46,6 +48,7 @@ public class Options
         [HelpOption]
         public string GetUsage()
         {
+            ShowHelp = true;
             var help = new HelpText
             {
                 AdditionalNewLineAfterOption = true,

diff --git a/mmbot/Program.cs b/mmbot/Program.cs
@@ -22,14 +22,17 @@ static void Main(string[] args)
             var options = new Options();
             CommandLine.Parser.Default.ParseArguments(args, options);
 
+            if (options.ShowHelp)
+            {
+                return;
+            }
+
             if (options.RunAsService)
             {
                 ServiceBase.Run(new ServiceBase[] { new Service(options) });
             }
             else
             {
-                CommandLine.Parser.Default.ParseArguments(args, options);
-
                 if (options.LastParserState != null && options.LastParserState.Errors.Any())
                 {
                     return;

diff --git a/mmbot/Properties/MMBot.nuspec b/mmbot/Properties/MMBot.nuspec
@@ -5,8 +5,8 @@
         <version>0.9</version>
         <authors>Peter Goodman</authors>
         <owners>Peter Goodman</owners>
-        <licenseUrl>https://github.com/PeteGoo/mmbot/blob/master/LICENSE.md</licenseUrl>
-        <projectUrl>https://github.com/PeteGoo/mmbot/</projectUrl>
+        <licenseUrl>https://github.com/mmbot/mmbot/blob/master/LICENSE.md</licenseUrl>
+        <projectUrl>https://github.com/mmbot/mmbot/</projectUrl>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <description>mmbot is a C# port of Github's Hubot chat bot</description>
         <releaseNotes>Initial pre-release version.</releaseNotes>
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ namespace MMBot @@
     {
         public class AdapterNotConfiguredException : Exception
         {
-            public AdapterNotConfiguredException() : base("You must configure the adapter first before you can use it. You can do this either via Environment variables or the config parameter. See http://github.com/PeteGoo/mmbot")
+            public AdapterNotConfiguredException() : base("You must configure the adapter first before you can use it. You can do this either via Environment variables or the config parameter. See http://github.com/mmbot/mmbot")
             {
             }
@@ Expand Down @@