args

Author: nidhimj22

example.php

@@ -11,7 +11,7 @@
 $me = new Local();
 $me->isRunning();
 echo "starting";
-$args = array("v" => 1);
+$args = array("-v" => 1);
 $me->start($args);
 echo "started";
 echo $me->isRunning();

lib/Local.php

@@ -32,37 +32,37 @@ public function isRunning() {
   }
 
   public function add_args($arg_key, $value = NULL) {
-    if ($arg_key == "key")
+    if ($arg_key == "-key")
       $this->key = $value;
-    elseif ($arg_key == "binaryPath")
+    elseif ($arg_key == "-binaryPath")
       $this->binary_path = $value;
-    elseif ($arg_key == "logfile")
+    elseif ($arg_key == "-logfile")
       $this->logfile = $value;
-    elseif ($arg_key == "v")
+    elseif ($arg_key == "-v")
       $this->verbose_flag = "-vvv";
-    elseif ($arg_key == "force")
+    elseif ($arg_key == "-force")
       $this->force_flag = "-force";
-    elseif ($arg_key == "only")
+    elseif ($arg_key == "-only")
       $this->only_flag = "-only";
-    elseif ($arg_key == "onlyAutomate")
+    elseif ($arg_key == "-onlyAutomate")
       $this->only_automate_flag = "-onlyAutomate";
-    elseif ($arg_key == "forcelocal")
+    elseif ($arg_key == "-forcelocal")
       $this->force_local_flag = "-forcelocal";
-    elseif ($arg_key == "localIdentifier")
+    elseif ($arg_key == "-localIdentifier")
       $this->local_identifier_flag = "-localIdentifier $value";
-    elseif ($arg_key == "proxyHost")
+    elseif ($arg_key == "-proxyHost")
       $this->proxy_host = "-proxyHost $value";
-    elseif ($arg_key == "proxyPort")
+    elseif ($arg_key == "-proxyPort")
       $this->proxy_port = "-proxyPort $value";
-    elseif ($arg_key == "proxyUser")
+    elseif ($arg_key == "-proxyUser")
       $this->proxy_user = "-proxyUser $value";
-    elseif ($arg_key == "proxyPass")
+    elseif ($arg_key == "-proxyPass")
       $this->proxy_pass = "-proxyPass $value";
-    elseif ($arg_key == "forceproxy")
+    elseif ($arg_key == "-forceproxy")
       $this->force_proxy_flag = "-forceproxy";
-    elseif ($arg_key == "hosts")
+    elseif ($arg_key == "-hosts")
       $this->hosts = $value;
-    elseif ($arg_key == "f") {
+    elseif ($arg_key == "-f") {
       $this->folder_flag = "-f";
       $this->folder_path = $value;
     }

tests/LocalTest.php

@@ -21,82 +21,82 @@ public function tearDown(){
   }
 
   public function test_verbose() {
-    $this->bs_local->add_args('v');
+    $this->bs_local->add_args('-v');
     $this->assertContains('-v',$this->bs_local->command());
   }
 
   public function test_set_folder() {
-    $this->bs_local->add_args('f', "/");
+    $this->bs_local->add_args('-f', "/");
     $this->assertContains('-f',$this->bs_local->command());
     $this->assertContains('/',$this->bs_local->command());
   }
 
   public function test_enable_force() {
-    $this->bs_local->add_args("force");
+    $this->bs_local->add_args("-force");
   }
 
   public function test_set_local_identifier() {
-    $this->bs_local->add_args("localIdentifier", "randomString");
+    $this->bs_local->add_args("-localIdentifier", "randomString");
     $this->assertContains('-localIdentifier randomString',$this->bs_local->command());
   }
 
   public function test_enable_only() {
-    $this->bs_local->add_args("only");
+    $this->bs_local->add_args("-only");
     $this->assertContains('-only',$this->bs_local->command());
   }
 
   public function test_enable_only_automate() {
-    $this->bs_local->add_args("onlyAutomate");
+    $this->bs_local->add_args("-onlyAutomate");
     $this->assertContains('-onlyAutomate', $this->bs_local->command()); 
   }
 
   public function test_enable_force_local() {
-    $this->bs_local->add_args("forcelocal");
+    $this->bs_local->add_args("-forcelocal");
     $this->assertContains('-forcelocal',$this->bs_local->command());
   }
 
   public function test_set_proxy() {
-    $this->bs_local->add_args("proxyHost", "localhost");
-    $this->bs_local->add_args("proxyPort", 8080);
-    $this->bs_local->add_args("proxyUser", "user");
-    $this->bs_local->add_args("proxyPass", "pass");
+    $this->bs_local->add_args("-proxyHost", "localhost");
+    $this->bs_local->add_args("-proxyPort", 8080);
+    $this->bs_local->add_args("-proxyUser", "user");
+    $this->bs_local->add_args("-proxyPass", "pass");
     $this->assertContains('-proxyHost localhost -proxyPort 8080 -proxyUser user -proxyPass pass',$this->bs_local->command());
   }
 
   public function test_enable_force_proxy() {
-    $this->bs_local->add_args("forceproxy");
+    $this->bs_local->add_args("-forceproxy");
     $this->assertContains('-forceproxy',$this->bs_local->command());
   }
 
 
   public function test_hosts() {
-    $this->bs_local->add_args("hosts", "localhost,8080,0");
+    $this->bs_local->add_args("-hosts", "localhost,8080,0");
     $this->assertContains('localhost,8080,0',$this->bs_local->command());
   }
 
   public function test_isRunning() {
     $this->assertFalse($this->bs_local->isRunning());
-    $this->bs_local->start(array('v' => true));
+    $this->bs_local->start(array('-v' => true));
     $this->assertTrue($this->bs_local->isRunning());
     $this->bs_local->stop();
     $this->assertFalse($this->bs_local->isRunning());
-    $this->bs_local->start(array('v' => true));
+    $this->bs_local->start(array('-v' => true));
     $this->assertTrue($this->bs_local->isRunning());
   }
 
   public function test_checkPid() {
     $this->assertFalse($this->bs_local->isRunning());
-    $this->bs_local->start(array('v' => true));
+    $this->bs_local->start(array('-v' => true));
     $this->assertTrue($this->bs_local->pid > 0);
   }
 
   public function test_multiple_binary() {
-    $this->bs_local->start(array('v' => true));
+    $this->bs_local->start(array('-v' => true));
     $bs_local_2 = new Local();  
     $log_file2 = getcwd(). '/log2.log';
     print($log_file2);
     try {
-      $bs_local_2->start(array('v' => true, 'logfile' => $log_file2));
+      $bs_local_2->start(array('-v' => true, '-logfile' => $log_file2));
       $this->fail("Expected Exception has not been raised.");
     } catch (LocalException $ex) {
       $emessage = $ex->getMessage();