hummer-client 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13da03a90d431a06a5ffc8e6a8d3ba3d35189e5a
-  data.tar.gz: 523bbc21d6160174a89194d0e60f4fc568680652
+  metadata.gz: c9a1ce8193cbeaf1076d8406935558b5b9f03bd9
+  data.tar.gz: e13d5a293af67e24946b05adedc1a1716601e1ea
 SHA512:
-  metadata.gz: 407a0745f83406bb42a9fde1832700ee108fc806a3587b3848152bcc693e1038c1b5eca363d5fe2019b3f9be7c0b23b0832feb544d64392d37f1c621c52a60f2
-  data.tar.gz: eb750a26d1f2d09acb87af448960618fd1f9284824c754de66d34e297d47156c22991174def24201a048dda01f4b29500c63866281e63fa041667a0199874a82
+  metadata.gz: 4a922452a387805059e369646a8481c1f8d9b7fc6f78457168f1931605d2adfbe4e3460a9893c25b3c610b1e410917dee2ed523e33cca4245e715bb576ab45b4
+  data.tar.gz: 01f4a8ca1039cf3b878660e2d778be746495082aa464ddf61c4ee3150d3f51ba0196319c087db4b67ff57aed5af4b08ca55d03bbeb72277f3b00cf6f7c07fc72

data/hummer-client.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_dependency "terminal-table"
+  spec.add_dependency "json"
   spec.add_dependency "mime-types", "<2.0"
   spec.add_dependency "rest-client"
 end

data/lib/hummer/client.rb

@@ -1,6 +1,6 @@
 require "hummer/client/version"
 require "hummer/client/command"
-require "hummer/client/api"
+require "hummer/client/model"
 
 module Hummer
   module Client

data/lib/hummer/client/command.rb

@@ -3,11 +3,16 @@ require 'optparse'
 require 'yaml'
 require 'readline'
 
+require 'hummer/client/model'
+
 module Hummer::Client
   class Command
+    include Hummer::Client::Model
     def initialize(config = nil)
       @options = {
-          :server => "http://0.0.0.0:3000"
+        :server => "http://0.0.0.0:3000",
+        :user => "00000000-0000-0000-0000-000000000000",
+        :token => ""
       }
       if config
         config = File.expand_path(config)
@@ -25,7 +30,7 @@ module Hummer::Client
       parser = OptionParser.new do|opts|
         opts.banner = "Usage: hummer [options] [command]"
         opts.separator ""
-        opts.separator "Specific commands: projects suites post"
+        opts.separator "Commands: projects suites features post"
         opts.separator ""
         opts.separator "Specific options:"
         opts.on('--help', 'Display help' ) do
@@ -46,15 +51,28 @@ module Hummer::Client
         opts.on('--suite ID', 'Suite ID' ) do |id|
           @options[:suite] = id
         end
+        opts.on('--features NAMEs', 'Feature name, separeted by \',\'' ) do |features|
+          @options[:features] = features
+        end
+        opts.on('--build name', 'Build for new post' ) do |build|
+          @options[:build] = build
+        end
         opts.on('--json', 'Output in JSON format' ) do
           @options[:json] = true
         end
         opts.on('--file FILE', 'XML file with test results') do |file|
           @options[:file] = file
         end
+        opts.on('--version', 'Display version') do
+          @options[:version] = true
+        end
       end
       begin
         parser.parse ARGV
+        if @options[:version]
+          puts "Version: #{Hummer::Client::VERSION}"
+          exit(0)
+        end
         if @options[:help] or ARGV.empty?
           puts parser
           exit(0)
@@ -63,64 +81,65 @@ module Hummer::Client
         puts e.message
       end
     end
+    def display(objects, titles)
+      objects = objects.kind_of?(Array) ? objects : objects.to_a
+      rows = []
+      rows << titles.collect{|_,title| title }
+      rows << :separator
+      objects.each do |object|
+        values = []
+        titles.collect{|key,_| key}.each do |attribute|
+          value = object.send(attribute)
+          if value.kind_of?(Array)
+            values << value.join(", ")
+          else
+            values << value
+          end
+        end
+        rows << values
+      end
+      puts Terminal::Table.new :rows => rows
+    end
     def run
-      API.configure(@options)
+      Base.configure(@options)
       command = ARGV.first
-      if "projects" == command
-        @projects = API.get()
-        if @projects.kind_of?(Hash) and @projects.has_key?("error")
-          puts @projects["error"]
-          exit(1)
-        end
-        if @options[:json]
-          puts @projects.inspect
-        else
-          rows = []
-          rows << ["ID","Name","Features","Owner"]
-          rows << :separator
-          @projects.each do |project|
-            rows << [project["id"],project["name"],project["feature_list"].join(", "),project["owner_name"]]
+      case command
+        when "features" then
+          display Feature.all, [[:id,"ID"],[:name, "Name"]]
+        when "projects" then
+          display Project.all, [[:id,"ID"],[:name,"Name"],[:feature_list,"Features"],[:owner_name,"Owner"]]
+        when "suites" then
+          if @options[:project]
+            project = Project.find(@options[:project])
+            suites = project.suites
+          else
+            suites = Suite.all
           end
-          table = Terminal::Table.new :rows => rows
-          puts table
-        end
-      elsif "post" == command
-        if @options[:project] and @options[:file]
-          API.post(@options[:project], @options[:file], Readline.readline('Build: '), Readline.readline('Tags: '))
-        else
-          puts "Need project and file"
-        end
-      elsif "upload" == command
-        if @options.has_key?(:project) and @options.has_key?(:file)
-          @suite = API.post(@options[:project], @options[:file])
-        else
-          puts "Need project and file"
-          exit(1)
-        end
-
-      elsif "suites" == command
-        if @options.has_key?(:project)
-          @suites = API.get(:project => @options[:project], :suite => nil)
-          if @suites.kind_of?(Hash) and @suites.has_key?("error")
-            puts @projects["error"]
-            exit(1)
+          display suites, [[:id,"ID"],[:build,"Build"],[:feature_list,"Features"],[:user_name,"User"],[:total_tests, "Tests"],[:total_errors, "Errors"],[:total_failures, "Failures"],[:total_skip,"Skip"],[:total_passed,"Passed"]]
+        when "post" then
+          project = @options[:project]
+          unless project
+            project = Readline.readline('Project> ')
+            project = Project.find(project.strip)
           end
-          if @options[:json]
-            puts @suites.inspect
-          else
-            rows = []
-            rows << ["ID","Build","Tests","Errors","Failures","Skip","Passed","Features","Owner"]
-            rows << :separator
-            @suites.each do |suite|
-              rows << [suite["id"],suite["build"],suite["total_tests"],suite["total_errors"],suite["total_failures"],suite["total_skip"],suite["total_passed"],suite["feature_list"].join(", "),suite["user_name"]]
-            end
-            table = Terminal::Table.new :rows => rows
-            puts table
+          build = @options[:build]
+          unless build
+            build = Readline.readline('Build> ')
           end
+          features = @options[:features]
+          unless features
+            puts "Already exists features: #{Feature.all.collect{|f| f.name}.join(", ")}"
+            puts "Default features: #{project.feature_list.join(", ")}"
+            features = Readline.readline('Features> ')
+          end
+          file = @options[:file]
+          unless file
+            file = Readline.readline('File> ')
+          end
+          Suite.save(project.id, build, features, file)
         else
-          puts "Need project"
+          puts "Unknown command: #{command}"
           exit(1)
-        end
       end
     end
   end

data/lib/hummer/client/model.rb

@@ -0,0 +1,5 @@
+require 'hummer/client/model/base'
+require 'hummer/client/model/feature'
+require 'hummer/client/model/project'
+require 'hummer/client/model/suite'
+

data/lib/hummer/client/model/base.rb

@@ -0,0 +1,46 @@
+require 'json'
+require 'rest_client'
+
+module Hummer::Client::Model
+  class Base
+    def self.configure(options)
+      @@server = RestClient::Resource.new(options[:server],
+        :headers => {
+          "X-User-ID" => options[:user],
+          "X-User-Token" => options[:token],
+          "Accept" => "application/json"
+        }
+      )
+    end
+    def self.resource res
+      @resource = res
+    end
+    def self.attributes *args
+      @attributes = []
+      args.each do |arg|
+        @attributes << arg
+        self.class_eval("def #{arg};@#{arg};end")
+        self.class_eval("def #{arg}=(val);@#{arg}=val;end")
+      end
+    end
+    def self.find(id, resource = nil)
+      new(JSON(@@server[resource || @resource][id].get))
+    rescue => e
+      puts "API error: #{e.message}"
+      exit(1)
+    end
+    def self.all(resource = nil)
+      JSON(@@server[resource || @resource].get).collect do |params|
+        new(params)
+      end
+    rescue => e
+      puts "API error: #{e.message}"
+      exit(1)
+    end
+    def initialize(params = {})
+      params.each do |key, value|
+        send("#{key}=", value) if respond_to? "#{key}="
+      end
+    end
+  end
+end

data/lib/hummer/client/model/feature.rb

@@ -0,0 +1,4 @@
+class Hummer::Client::Model::Feature < Hummer::Client::Model::Base
+  attributes :id, :name
+  resource "features"
+end

data/lib/hummer/client/model/project.rb

@@ -0,0 +1,7 @@
+class Hummer::Client::Model::Project < Hummer::Client::Model::Base
+  attributes :id, :name, :feature_list, :owner_name, :created_at, :updated_at
+  resource "projects"
+  def suites
+    Hummer::Client::Model::Suite.all("projects/#{id}/suites")
+  end
+end

data/lib/hummer/client/model/suite.rb

@@ -0,0 +1,18 @@
+class Hummer::Client::Model::Suite < Hummer::Client::Model::Base
+  attributes :id, :project_id, :build, :total_tests, :total_errors, :total_failures, :total_skip, :total_passed, :feature_list, :user_name
+  resource "suites"
+  def project
+    Hummer::Client::Model::Project.find(project_id)
+  end
+  def self.save(project, build, feature_list, file)
+    @@server["projects/#{project}/suites"].post({
+          :tempest => File.open(file),
+          :build => build,
+          :feature_list => feature_list,
+          :multipart => true
+    })
+  rescue => e
+    puts "API error: #{e.message}"
+    exit(1)
+  end
+end

data/lib/hummer/client/version.rb

@@ -1,5 +1,5 @@
 module Hummer
   module Client
-    VERSION = "0.0.2"
+    VERSION = "0.1.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hummer-client
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - 'Evgeniy Shurmin '
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-06 00:00:00.000000000 Z
+date: 2013-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
@@ -97,8 +111,12 @@ files:
 - hummer-client.gemspec
 - hummer.yml
 - lib/hummer/client.rb
-- lib/hummer/client/api.rb
 - lib/hummer/client/command.rb
+- lib/hummer/client/model.rb
+- lib/hummer/client/model/base.rb
+- lib/hummer/client/model/feature.rb
+- lib/hummer/client/model/project.rb
+- lib/hummer/client/model/suite.rb
 - lib/hummer/client/version.rb
 homepage: ''
 licenses:

data/lib/hummer/client/api.rb

@@ -1,29 +0,0 @@
-require 'json'
-require 'net/http'
-require 'rest_client'
-
-module Hummer::Client
-  class API
-    def self.configure(options)
-      @server = RestClient::Resource.new(options[:server],
-        :headers => {
-          "X-User-ID" => options[:user],
-          "X-User-Token" => options[:token],
-          "Accept" => "application/json"
-        }
-      )
-    end
-    def self.get(options = {})
-      if options.has_key?(:project) and options.has_key?(:suite)
-        JSON @server['projects'][options[:project]]['suites'][options[:suite]].get
-      elsif options.has_key?(:project)
-        JSON @server['projects'][options[:project]]['suites'].get
-      else
-        JSON @server['projects'].get
-      end
-    end
-    def self.post(project,file,build,feature_list)
-      JSON @server['projects'][project]['suites'].post :tempest => File.open(file), :build => build, :feature_list => feature_list
-    end
-  end
-end