From eadf625a51b23a8f62505949df863bdc8b2d0546 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Sun, 6 Jun 2010 18:08:06 +0200
Subject: create a class folder and move FedoraClient

---
 fedcli.php | 43 ++++++++++++++++++++++---------------------
 1 file changed, 22 insertions(+), 21 deletions(-)

(limited to 'fedcli.php')

diff --git a/fedcli.php b/fedcli.php
index ce9c31a..eb897c4 100755
--- a/fedcli.php
+++ b/fedcli.php
@@ -2,33 +2,34 @@
 <?php
 /*
  * FedoraClient is a PHP classe to interact with web services
- * 
+ *
  * fedcli.php is a command line tools to test FedoraClient clmsses
- * 
+ *
  * Copyright (C) 2010  Remi Collet
  * http://github.com/remicollet/rpmphp.
- * 
+ *
  * Inspired from python-fedora
- * 
+ *
  * FedoraClient is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
  * python-fedora is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * See <http://www.gnu.org/licenses/>
  */
- 
+
+
 require 'Console/Getargs.php';
-require 'FedoraClient.php';
+require 'class/FedoraClient.php';
 
 function Help() {
    echo "\nFedora Client Command Line usage\n\n";
-   
+
    echo "fdcli   command   options\n";
    echo "\tbranch:   branch info\n";
    echo "\tbranches: list branches\n";
@@ -43,11 +44,11 @@ function Branches() {
      "debug"  => array('short' => 'd', 'max' =>  1, 'min' => 1, 'desc' => "debug level", 'default' => "0")
    );
    $args =& Console_Getargs::factory($config);
-   
+
    if (PEAR::isError($args)) {
       die (Console_Getargs::getHelp($config));
    }
-   
+
    $client = new FedoraPkgdb(array('debug' => intval($args->getValue('debug'))));
    $branches = $client->getBranches();
    foreach ($branches as $name => $branch) {
@@ -62,11 +63,11 @@ function Branch() {
      "debug"  => array('short' => 'd', 'max' =>  1, 'min' => 1, 'desc' => "debug level", 'default' => "0")
    );
    $args =& Console_Getargs::factory($config);
-   
+
    if (PEAR::isError($args)) {
       die (Console_Getargs::getHelp($config));
    }
-   
+
    $client = new FedoraPkgdb(array('debug' => intval($args->getValue('debug'))));
    $branch = $client->getBranch($args->getValue('branch'));
    print_r($branch);
@@ -78,11 +79,11 @@ function CritPath() {
      "debug"  => array('short' => 'd', 'max' =>  1, 'min' => 1, 'desc' => "debug level", 'default' => "0")
    );
    $args =& Console_Getargs::factory($config);
-   
+
    if (PEAR::isError($args)) {
       die (Console_Getargs::getHelp($config));
    }
-   
+
    $client = new FedoraPkgdb(array('debug' => intval($args->getValue('debug'))));
    $branch = $client->getCritPath();
    print_r($branch);
@@ -94,7 +95,7 @@ function Package() {
      "debug"   => array('short' => 'd', 'max' =>  1, 'min' => 1, 'desc' => "debug level", 'default' => "0")
    );
    $args =& Console_Getargs::factory($config);
-   
+
    if (PEAR::isError($args)) {
       die (Console_Getargs::getHelp($config));
    }
@@ -104,7 +105,7 @@ function Package() {
    if (!$rep) {
       die("Package not found\n");
    }
-   
+
    $first = true;
    foreach ($rep as $branch => $pack) {
       if ($first) {
@@ -114,7 +115,7 @@ function Package() {
          echo "Description:\n".$pack['package']['description']."\n";
       }
       echo $branch.":\t".$pack['owner'];
-      
+
       $i=0;
       foreach ($pack['people'] as $user) {
          if (isset($user['aclOrder']['commit']['statuscode']) && $user['aclOrder']['commit']['statuscode']==3) {
@@ -130,11 +131,11 @@ function Version() {
      "debug"  => array('short' => 'd', 'max' =>  1, 'min' => 1, 'desc' => "debug level", 'default' => "0")
    );
    $args =& Console_Getargs::factory($config);
-   
+
    if (PEAR::isError($args)) {
       die (Console_Getargs::getHelp($config)."\n");
    }
-   
+
    echo "PHP Fedora Client class version ".FEDORACLIENT_VERSION."\n";
 }
 
@@ -147,6 +148,6 @@ switch ($cmd) {
    case 'critpath':  CritPath();    break;
    case 'package':   Package();     break;
    case 'version':   Version();     break;
-   default:          Help();      
+   default:          Help();
 }
 ?>
-- 
cgit 


From 50f2de59ed8ea3f41530fc4f06c12ae1613416ab Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Sun, 11 Jul 2010 18:23:35 +0200
Subject: fix fedcli

---
 fedcli.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'fedcli.php')

diff --git a/fedcli.php b/fedcli.php
index eb897c4..1d5f485 100755
--- a/fedcli.php
+++ b/fedcli.php
@@ -23,9 +23,10 @@
  * See <http://www.gnu.org/licenses/>
  */
 
+define ('CLIONLY', true);
 
+require 'include/main.php';
 require 'Console/Getargs.php';
-require 'class/FedoraClient.php';
 
 function Help() {
    echo "\nFedora Client Command Line usage\n\n";
-- 
cgit 


From 6e6d59bf0677c6b2d5b92a6abdab15a7ecaf9947 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Sun, 11 Jul 2010 19:10:36 +0200
Subject: move FEDORACLIENT_VERSION to class, so FedoraClient::VERSION

---
 fedcli.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'fedcli.php')

diff --git a/fedcli.php b/fedcli.php
index 1d5f485..40b5b0c 100755
--- a/fedcli.php
+++ b/fedcli.php
@@ -137,7 +137,7 @@ function Version() {
       die (Console_Getargs::getHelp($config)."\n");
    }
 
-   echo "PHP Fedora Client class version ".FEDORACLIENT_VERSION."\n";
+   echo "PHP Fedora Client class version ".FedoraClient::VERSION."\n";
 }
 
 $cmd = array_shift($_SERVER['argv']);
-- 
cgit