Merge pull request #151 from sbalabanov/master

Nailgun 1.0.0

LICENSE.txt

@@ -1,4 +1,5 @@
 Nailgun Copyright © 2004-2012, Martian Software, Inc.
+Copyright © 2017-present Facebook, Inc.
 
 Apache License
                            Version 2.0, January 2004

README.md

@@ -22,6 +22,6 @@ you will additionally need to "make ng.exe".
 
 A ruby client is available through the [railgun](https://github.com/timuralp/railgun) project.
 
-For more information, see [the nailgun website](http://martiansoftware.com/nailgun/).
+For more information, see [the nailgun website](https://github.com/facebook/nailgun).
 
 

nailgun-client/c/ng.c

@@ -1,6 +1,6 @@
 /*
-
   Copyright 2004-2012, Martian Software, Inc.
+  Copyright 2017-Present Facebook, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
-
 */
 
 /**
@@ -42,7 +41,7 @@
 #include <fcntl.h>
 #include <errno.h>
 
-#define NAILGUN_VERSION "0.9.0"
+#define NAILGUN_VERSION "1.0.0"
 
 #define BUFSIZE (2048)
 

nailgun-client/py/ng.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 #
 # Copyright 2004-2015, Martian Software, Inc.
+# Copyright 2017-Present Facebook, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -55,7 +56,7 @@ def bytes_to_str(bytes_to_convert):
 #
 # Please try to keep this working on Python 2.6.
 
-NAILGUN_VERSION = "0.9.3"
+NAILGUN_VERSION = "1.0.0"
 BUFSIZE = 2048
 NAILGUN_PORT_DEFAULT = 2113
 CHUNK_HEADER_LEN = 5

nailgun-client/py/test_ng.py

@@ -1,3 +1,20 @@
+#!/usr/bin/env python
+#
+# Copyright 2004-2015, Martian Software, Inc.
+# Copyright 2017-Present Facebook, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 import subprocess
 import os
 import time
@@ -60,8 +77,8 @@ def setUpTransport(self):
 
     def getClassPath(self):
         cp = [
-            "nailgun-server/target/nailgun-server-0.9.3-SNAPSHOT-uber.jar",
-            "nailgun-examples/target/nailgun-examples-0.9.3-SNAPSHOT.jar",
+            "nailgun-server/target/nailgun-server-1.0.0-SNAPSHOT-uber.jar",
+            "nailgun-examples/target/nailgun-examples-1.0.0-SNAPSHOT.jar",
         ]
         if os.name == "nt":
             return ";".join(cp)
@@ -119,7 +136,7 @@ def preexec_fn():
                 + suspend
             )
         cmd = cmd + [
-            "com.martiansoftware.nailgun.NGServer",
+            "com.facebook.nailgun.NGServer",
             self.transport_address,
             str(self.heartbeat_timeout_ms),
         ]
@@ -196,7 +213,7 @@ def test_nailgun_stats(self):
             exit_code = c.send_command("ng-stats")
         self.assertEqual(exit_code, 0)
         actual_out = output.getvalue().strip()
-        expected_out = "com.martiansoftware.nailgun.builtins.NGServerStats: 1/1"
+        expected_out = "com.facebook.nailgun.builtins.NGServerStats: 1/1"
         self.assertEqual(actual_out, expected_out)
 
     def test_nailgun_exit_code(self):
@@ -206,7 +223,7 @@ def test_nailgun_exit_code(self):
             self.transport_address, stderr=None, stdin=None, stdout=output
         ) as c:
             exit_code = c.send_command(
-                "com.martiansoftware.nailgun.examples.Exit", [str(expected_exit_code)]
+                "com.facebook.nailgun.examples.Exit", [str(expected_exit_code)]
             )
         self.assertEqual(exit_code, expected_exit_code)
 
@@ -218,7 +235,7 @@ def test_nailgun_stdin(self):
         with NailgunConnection(
             self.transport_address, stderr=None, stdin=input, stdout=output
         ) as c:
-            exit_code = c.send_command("com.martiansoftware.nailgun.examples.Echo")
+            exit_code = c.send_command("com.facebook.nailgun.examples.Echo")
         self.assertEqual(exit_code, 0)
         actual_out = output.getvalue().strip()
         self.assertEqual(actual_out, echo)
@@ -240,7 +257,7 @@ def test_nailgun_heartbeats(self):
             # just run Heartbeat nail for 5 seconds. During this period there should be
             # heartbeats received and printed back
             exit_code = c.send_command(
-                "com.martiansoftware.nailgun.examples.Heartbeat", ["5000"]
+                "com.facebook.nailgun.examples.Heartbeat", ["5000"]
             )
         self.assertTrue(output.getvalue().count("H") > 10)
 
@@ -254,7 +271,7 @@ def test_nailgun_no_heartbeat(self):
             heartbeat_interval_sec=0,
         ) as c:
             exit_code = c.send_command(
-                "com.martiansoftware.nailgun.examples.Heartbeat", ["3000"]
+                "com.facebook.nailgun.examples.Heartbeat", ["3000"]
             )
         self.assertTrue(output.getvalue().count("H") == 0)
 
@@ -269,7 +286,7 @@ def test_stress_nailgun_socket_close_without_race_condition(self):
                 heartbeat_interval_sec=0.001,
             ) as c:
                 exit_code = c.send_command(
-                    "com.martiansoftware.nailgun.examples.Heartbeat", ["10"]
+                    "com.facebook.nailgun.examples.Heartbeat", ["10"]
                 )
             self.assertEqual(exit_code, 0)
 
@@ -301,7 +318,7 @@ def test_nailgun_disconnect(self):
             heartbeat_interval_sec=5,
         ) as c:
             exit_code = c.send_command(
-                "com.martiansoftware.nailgun.examples.Heartbeat", ["30000"]
+                "com.facebook.nailgun.examples.Heartbeat", ["30000"]
             )
         self.assertTrue(output.getvalue().count("H") < 3)
 

nailgun-examples/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>com.martiansoftware</groupId>
+    <groupId>com.facebook</groupId>
     <artifactId>nailgun-examples</artifactId>
     <packaging>jar</packaging>
 
@@ -19,14 +19,14 @@
     <url>http://github.com/facebook/nailgun</url>
 
     <parent>
-        <groupId>com.martiansoftware</groupId>
+        <groupId>com.facebook</groupId>
         <artifactId>nailgun-all</artifactId>
-        <version>0.9.3-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>
         <dependency>
-            <groupId>com.martiansoftware</groupId>
+            <groupId>com.facebook</groupId>
             <artifactId>nailgun-server</artifactId>
             <version>${project.version}</version>
             <scope>compile</scope>

nailgun-examples/src/main/java/com/martiansoftware/nailgun/examples/DumpAll.java → nailgun-examples/src/main/java/com/facebook/nailgun/examples/DumpAll.java

@@ -1,6 +1,6 @@
 /*
-
   Copyright 2004-2012, Martian Software, Inc.
+  Copyright 2017-Present Facebook, Inc.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -13,12 +13,11 @@
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
-
 */
 
-package com.martiansoftware.nailgun.examples;
+package com.facebook.nailgun.examples;
 
-import com.martiansoftware.nailgun.NGContext;
+import com.facebook.nailgun.NGContext;
 import java.util.TreeSet;
 
 /**

nailgun-examples/src/main/java/com/martiansoftware/nailgun/examples/Echo.java → nailgun-examples/src/main/java/com/facebook/nailgun/examples/Echo.java

@@ -1,6 +1,6 @@
 /*
-
   Copyright 2004-2012, Martian Software, Inc.
+  Copyright 2017-Present Facebook, Inc.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -13,10 +13,9 @@
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
-
 */
 
-package com.martiansoftware.nailgun.examples;
+package com.facebook.nailgun.examples;
 
 /**
  * Echos everything it reads from System.in to System.out.

nailgun-examples/src/main/java/com/facebook/nailgun/examples/Exit.java

@@ -0,0 +1,36 @@
+/*
+  Copyright 2004-2012, Martian Software, Inc.
+  Copyright 2017-Present Facebook, Inc
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+*/
+
+package com.facebook.nailgun.examples;
+
+/** Finish nail with provided exit code */
+public class Exit {
+
+  public static void main(String[] args) {
+    int exitCode = (int) ((Math.random() * 1000) + 1);
+    if (args.length > 0) {
+      try {
+        exitCode = Integer.parseInt(args[0]);
+      } catch (Exception e) {
+      }
+    }
+    // Close stdout to test the exit code is returned properly
+    // even in such case
+    System.out.close();
+    System.exit(exitCode);
+  }
+}

nailgun-examples/src/main/java/com/martiansoftware/nailgun/examples/Hash.java → nailgun-examples/src/main/java/com/facebook/nailgun/examples/Hash.java

@@ -1,24 +1,23 @@
 /*
+  Copyright 2004-2012, Martian Software, Inc.
+  Copyright 2017-Present Facebook, Inc.
 
-Copyright 2004-2012, Martian Software, Inc.
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+  http://www.apache.org/licenses/LICENSE-2.0
 
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
 */
 
-package com.martiansoftware.nailgun.examples;
+package com.facebook.nailgun.examples;
 
-import com.martiansoftware.nailgun.NGContext;
+import com.facebook.nailgun.NGContext;
 import java.security.MessageDigest;
 import java.security.Provider;
 import java.security.Security;

nailgun-examples/src/main/java/com/martiansoftware/nailgun/examples/Heartbeat.java → nailgun-examples/src/main/java/com/facebook/nailgun/examples/Heartbeat.java

@@ -1,5 +1,4 @@
 /*
-
   Copyright 2004-2012, Jim Purbrick.
 
   Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,12 +12,11 @@
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
-
 */
 
-package com.martiansoftware.nailgun.examples;
+package com.facebook.nailgun.examples;
 
-import com.martiansoftware.nailgun.NGContext;
+import com.facebook.nailgun.NGContext;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 /** Print H for each heartbeat received */

nailgun-examples/src/main/java/com/martiansoftware/nailgun/examples/HelloWorld.java → nailgun-examples/src/main/java/com/facebook/nailgun/examples/HelloWorld.java

@@ -1,6 +1,6 @@
 /*
-
   Copyright 2004-2012, Martian Software, Inc.
+  Copyright 2017-Present Facebook, Inc.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -13,10 +13,9 @@
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
-
 */
 
-package com.martiansoftware.nailgun.examples;
+package com.facebook.nailgun.examples;
 
 /**
  * A truly amazing program that must be seen to be believed.

nailgun-examples/src/main/java/com/martiansoftware/nailgun/examples/Prompt.java → nailgun-examples/src/main/java/com/facebook/nailgun/examples/Prompt.java

@@ -1,6 +1,6 @@
 /*
-
   Copyright 2004-2012, Martian Software, Inc.
+  Copyright 2017-Present Facebook, Inc.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -13,12 +13,11 @@
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
-
 */
 
-package com.martiansoftware.nailgun.examples;
+package com.facebook.nailgun.examples;
 
-import com.martiansoftware.nailgun.NGContext;
+import com.facebook.nailgun.NGContext;
 
 /**
  * Prompts the user for input using a JOptionPane, and displays the result to the client's stdout.