veye 0.2.1 → 0.3.0

data/lib/veye/views/package/info_pretty.rb

@@ -15,9 +15,11 @@ module Veye
         printf("\t%-15s: %s\n", "Product key",
                                 "#{result["prod_key"]}".bright)
         printf("\t%-15s:\n\t %s\n", "Description", result["description"])
-        printf("\t%-15s: %s\n", "Group id", result["group_id"])
-        printf("\t%-15s: %s\n", "Link", result["links"].first.fetch('link'))
+        printf("\t%-15s: %s\n", 'Group id', result["group_id"])
+        printf("\t%-15s: %s\n", 'Link', result["links"].first.fetch('link'))
 
+        vulns = result['security_vulnerabilities'].to_a.map {|x| x['name_id'] }.join(',') 
+        printf("\t%-15s: %s\n", 'CVEs', (vulns.empty? ? 'none'.color(:green) : vulns.color(:red)))
       end
     end
 

data/lib/veye/views/package/info_table.rb

@@ -4,17 +4,20 @@ module Veye
   module Package
     class InfoTable < BaseTable
       def initialize
-        headings = %w(name version product_key language license description)
+        headings = %w(name version product_key language license description CVEs)
         super("Package information", headings)
       end
       def format(results)
         result = results
         return if result.nil?
+        
+        vulns = result['security_vulnerabilities'].to_a.map {|x| x['name_id'] }.join(',') 
 
         row = [result["name"], result["version"], result["prod_key"]]
         row << result["language"]
         row << result["license_info"]
         row << result["description"]
+        row << vulns
 
         @table << row
       end

data/lib/veye/views/package/versions_csv.rb

@@ -0,0 +1,24 @@
+require_relative '../base_csv.rb'
+
+module Veye
+  module Package
+    class VersionsCSV < BaseCSV
+      def initialize
+        headers = "nr,version,language,prod_key,prod_type,released_at"
+        super(headers)
+      end
+
+      def format(results, n = 10, from = 0)
+        prod_dt = results
+
+        results['versions'].to_a.each_with_index do |ver, i|
+          printf(
+            "%s,%s,%s,%s,%s,%s\n",
+             (from + i + 1), ver['version'], prod_dt['language'],
+             prod_dt['prod_key'], prod_dt['prod_type'], ver['released_at']
+          )
+        end
+      end
+    end
+  end
+end

data/lib/veye/views/package/versions_json.rb

@@ -0,0 +1,15 @@
+require_relative '../base_json.rb'
+
+module Veye
+  module Package
+    class VersionsJSON < BaseJSON
+      def format(results, n = 10, from = 0)
+        @results[:results]    = results
+        @results[:pagination] = {
+          n: n,
+          from: from
+        }
+      end
+    end
+  end
+end

data/lib/veye/views/package/versions_pretty.rb

@@ -0,0 +1,23 @@
+require_relative '../base_pretty.rb'
+
+module Veye
+  module Package
+    class VersionsPretty < BasePretty
+      def format(result, n = 10, from = 0)
+        return if result.nil?
+
+        printf("\t%15s - %s\n", result['name'].to_s.color(:green).bright, result['version'].to_s.bright)
+        printf("\t%-15s: %s\n", 'Language', result['language'])
+        printf("\t%-15s: %s\n", 'Product type', result['prod_type'])
+        printf("\t%-15s: %s\n", 'Product key', result['prod_key'])
+
+        printf("\t%-15s: %d after skipping %d items\n", 'Showing items', n, from)
+
+
+        result['versions'].to_a.each_with_index do |ver, i|
+          printf("\t%-15s: %s\t%s\n", ver['version'], (from + i + 1), ver['released_at'])
+        end
+      end
+    end
+  end
+end

data/lib/veye/views/package/versions_table.rb

@@ -0,0 +1,27 @@
+require_relative '../base_table.rb'
+
+module Veye
+  module Package
+    class VersionsTable < BaseTable
+      def initialize
+        headings = %w(nr name version released_at product_key language product_type)
+        super('Package versions', headings)
+      end
+
+      def format(results, n = 10, from = 0)
+        return if results.nil?
+
+        results['versions'].to_a.each_with_index do |ver, i|
+          row = [
+            (from + i + 1), results['name'], ver['version'], ver['released_at'],
+            results['prod_key'], results['language'], results['prod_type']
+          ]
+        
+          @table << row
+        end
+        
+        @table
+      end
+    end
+  end
+end

data/lib/veye/views/package.rb

@@ -13,6 +13,10 @@ require_relative 'package/references_json.rb'
 require_relative 'package/references_pretty.rb'
 require_relative 'package/references_table.rb'
 
+require_relative 'package/versions_csv.rb'
+require_relative 'package/versions_json.rb'
+require_relative 'package/versions_pretty.rb'
+require_relative 'package/versions_table.rb'
 
 module Veye
   module Package

data/lib/veye/views/project/dependency_csv.rb

@@ -4,7 +4,7 @@ module Veye
   module Project
     class DependencyCSV < BaseCSV
       def initialize
-        headings = "nr,name,prod_key,outdated,current,requested,stable,licenses"
+        headings = "nr,name,prod_key,outdated,current,requested,stable,licenses,upgrade_cost"
         super(headings)
       end
 
@@ -22,15 +22,23 @@ module Veye
       end
 
       def print_line(result, i)
-        printf("%d,%s,%s,%s,%s,%s,%s,%s\n",
-               i,
-               result['name'],
-               result['prod_key'],
-               result['outdated'],
-               result['version_current'],
-               result['version_requested'],
-               result['stable'],
-               result['licenses'].to_a.map {|x| x['name']}.join(';'))
+        upgrade_cost = if result.has_key?(:upgrade)
+                        "#{result[:upgrade][:difficulty]}(#{result[:upgrade][:dv_score]})"
+                       else
+                        nil
+                       end
+        printf(
+          "%d,%s,%s,%s,%s,%s,%s,'%s','%s'\n",
+           i,
+           result['name'],
+           result['prod_key'],
+           result['outdated'],
+           result['version_current'],
+           result['version_requested'],
+           result['stable'],
+           result['licenses'].to_a.map {|x| x['name']}.join(';'),
+           upgrade_cost
+        )
       end
 
       def print_line_with_filename(result, i, filename)

data/lib/veye/views/project/dependency_pretty.rb

@@ -6,7 +6,8 @@ module Veye
       def format(results, filename = nil)
         return if results.nil?
         results = [results] if results.is_a?(Hash)
-        printf("#-- Dependencies ------------------------------------------\n")
+
+        printf("#-- Dependencies #{filename.to_s}-----------------------------------------\n")
         results.each_with_index do |result, index|
           project_name = "#{result['name']}".color(:green).bright
           printf("%3d - %s\n", index + 1, project_name)
@@ -25,10 +26,20 @@ module Veye
           printf("\t%-15s: %s\n", "Current", "#{result['version_current']}".color(color_code))
 
           printf("\t%-15s: %s\n", "Requested", result["version_requested"])
-
+          
           licenses = result["licenses"].to_a.map {|x| x['name']}
           printf("\t%-15s: %s\n", "Licenses", licenses.join(', '))
 
+          if result.has_key?(:upgrade)
+            printf(
+              "\t%-15s: %s(%.2f)\n",
+              "Upgrade cost",
+              result[:upgrade][:difficulty],
+              result[:upgrade][:dv_score]
+            )
+          end
+
+
         end
       end
     end

data/lib/veye/views/project/dependency_table.rb

@@ -4,13 +4,18 @@ module Veye
   module Project
     class DependencyTable < BaseTable
       def initialize
-        headings = %w{index name prod_key version_current version_requested outdated stable license}
+        headings = %w{index name prod_key version_current version_requested outdated stable license upgrade_cost}
         super("Project dependencies", headings)
       end
       def format(results, filename = nil)
         results = [results] if results.is_a?(Hash)
 
         results.each_with_index do |result, index|
+          upgrade_cost = if result.has_key?(:upgrade)
+                          "#{result[:upgrade][:difficulty]}(#{result[:upgrade][:dv_score]})"
+                         else
+                           ''
+                         end
           row = [
             index + 1,
             (filename or result["name"]),
@@ -19,7 +24,8 @@ module Veye
             result["version_requested"],
             result["outdated"] ? "outdated":"no",
             result["stable"] ? "stable": "unstable",
-            result["licenses"].to_a.map {|x| x['name']}.join(',')
+            result["licenses"].to_a.map {|x| x['name']}.join(','),
+            upgrade_cost
           ]
           @table << row
         end

data/lib/veye/views/project/info_csv.rb

@@ -4,18 +4,24 @@ module Veye
   module Project
     class InfoCSV < BaseCSV
       def initialize
-        headers = "nr,name,project_key,public,period,source,dep_number,out_number,created_at"
+        headers = "nr,name,project_id,public,period,source,dep_number,out_number,created_at"
         super(headers)
       end
       def format(results)
         return nil if results.nil?
         results = [results] if results.is_a? Hash
-
+        
         results.each_with_index do |result, index|
+          #BUG: API returns raw mongoID value as id when fetching a list of projects
+          if result['id'].is_a?(Hash)
+            result['id'] = result['id'].values.first 
+          end
+
+
           printf("%d,%s,%s,%s,%s,%s,%s,%s,%s\n",
                 index + 1,
                 result['name'],
-                result['project_key'],
+                result['id'],
                 result['public'],
                 result['period'],
                 result['source'],

data/lib/veye/views/project/info_markdown.rb

@@ -4,7 +4,7 @@ module Veye
   module Project
     class InfoMarkdown < BaseMarkdown
       def initialize
-        headings  = %w(index name project_key project_type public period source dependencies outdated created)
+        headings  = %w(index name project_id project_type public period source dependencies outdated created)
         super("Project's information", headings)
       end
 
@@ -13,10 +13,15 @@ module Veye
 
         results = [results] if results.is_a?(Hash) #required for  `project show`
         results.each_with_index do |result, index|
+          #BUG: API returns raw mongoID value as id when fetching a list of projects
+          if result['id'].is_a?(Hash)
+            result['id'] = result['id'].values.first 
+          end
+ 
           @table << [
             (index + 1).to_s,
             result["name"],
-            result["project_key"],
+            result["id"],
             result["project_type"],
             result["public"].to_s,
             result["period"],

data/lib/veye/views/project/info_pretty.rb

@@ -9,9 +9,14 @@ module Veye
         results = [results] if results.is_a? Hash
 
         results.each_with_index do |result, index|
+          #BUG: API returns raw mongoID value as id when fetching a list of projects
+          if result['id'].is_a?(Hash)
+            result['id'] = result['id'].values.first 
+          end
+          
           project_name = "#{result['name']}".color(:green).bright
           printf("%3d - %s\n", index + 1, project_name)
-          printf("\t%-15s: %s\n", "Project key", "#{result['id']}".bright)
+          printf("\t%-15s: %s\n", "Project id", "#{result['id']}".bright)
           printf("\t%-15s: %s\n", "Project type", result['project_type'])
           printf("\t%-15s: %s\n", "Public", result['public'])
           printf("\t%-15s: %s\n", "Period", result['period'])

data/lib/veye/views/project/info_table.rb

@@ -4,7 +4,7 @@ module Veye
   module Project
     class InfoTable < BaseTable
       def initialize
-        headings = %w(index name project_key private period source dependencies outdated created_at)
+        headings = %w(index name project_id public period source dependencies outdated created_at)
         super("List of projects", headings)
       end
 
@@ -13,8 +13,13 @@ module Veye
         results = [results] if results.is_a? Hash
 
         results.each_with_index do |result, index|
-          row = [index + 1, result['name'], result['project_key'],
-                 result['private'], result['period'], result['source'],
+          #BUG: API returns raw mongoID value as id when fetching a list of projects
+          if result['id'].is_a?(Hash)
+            result['id'] = result['id'].values.first 
+          end
+
+          row = [index + 1, result['name'], result['id'],
+                 result['public'], result['period'], result['source'],
                  result['dep_number'], result['out_number'], result['created_at']]
           @table << row
          end

data/lib/veye.rb

@@ -2,6 +2,7 @@
 # you just need to require this one file in your bin file
 require 'rest-client'
 require 'yaml'
+require 'logger'
 
 require 'veye/helpers/format_helpers.rb'
 
@@ -30,7 +31,7 @@ end
 
 def check_config_file
   unless config_exists?
-    p format(
+    printf(
       "%s: %s\n",
       'config file doesnt exist.'.color(:red),
       'Use `veye initconfig` to initialize settings file.'
@@ -57,7 +58,7 @@ end
 def check_api_key(global_opts)
   result = false
   if global_opts[:api_key].nil? || global_opts[:api_key].match("add your api key")
-    print format(
+    printf(
       "%s: %s\n",
       'Warning: API key is missing.'.color(:yellow),
       'You cant access private data.'
@@ -74,9 +75,31 @@ def save_configs
   File.open(filepath, 'w') do |f|
     f.puts $global_options.to_yaml
   end
-  print format(
+  printf(
     "%s: %s",
     'Success'.color(:green),
     "new settings are saved into file: `#{filepath}`"
   )
 end
+
+
+#-- initialize logger
+module Veye
+  class << self
+    attr_writer :logger
+
+    def logger
+      @logger ||= Logger.new('veye.log').tap do |log|
+        log.level = case $global_options.fetch(:log_level, 'debug')
+                    when 'info'   then Logger::INFO
+                    when 'debug'  then Logger::DEBUG 
+                    when 'warn'   then Logger::INFO
+                    when 'error'  then Logger::ERROR
+                    when 'fatal'  then Logger::FATAL
+                    else Logger::DEBUG
+                    end
+        log.progname = self.name
+      end
+    end
+  end
+end

data/test/api/package_test.rb

@@ -33,6 +33,21 @@ class PackageTest < Minitest::Test
     end
   end
 
+  def test_version_list_api_call
+    VCR.use_cassette('package_versions') do
+      res = Veye::API::Package.get_version_list(@api_key, 'ruby', 'ruby')
+      refute_nil res
+      assert_equal 200, res.code
+      assert_equal true, res.success
+      assert_equal 'ruby', res.data['name']
+      assert_equal 'ruby', res.data['language']
+      assert_equal '0.1.0', res.data['version']
+      assert_equal 'RubyGem', res.data['prod_type']
+      assert_equal 1, res.data['versions'].count
+      assert_equal '0.1.0', res.data['versions'].first['version']
+    end
+  end
+
   def test_get_follow_status_api_call
     VCR.use_cassette('package_follow_status') do
       res = Veye::API::Package.get_follow_status(@api_key, 'ruby', 'ruby')

data/test/api/project_test.rb

@@ -3,24 +3,45 @@ require 'test_helper'
 class ProjectTest < Minitest::Test
   def setup
     init_environment
-    @api_key = ENV["VEYE_API_KEY"]
-    @test_file = "test/files/maven-1.0.1.pom.xml"
-    @project_key = "maven2_openejb_maven_plugins_1"
+    @api_key      = ENV["VEYE_API_KEY"]
+    @test_file    = "test/files/maven-1.0.1.pom.xml"
+    @test_file2   = "test/files/Gemfile"
+    @project_key  = upload_project["id"]
+
+    @org_name     = "veye_test"
+    @team_name    = "veye_cli_tool"
+  end
+
+  def upload_project(test_file = nil, is_temporary = true, task_id = nil)
+    cassette_name = ( task_id.nil? ? 'project_upload' : "project_upload_#{task_id}" ) 
+    test_file ||= @test_file
+    org_name = @org_name
+      
+    VCR.use_cassette(cassette_name) do
+      res = Veye::API::Project.upload(@api_key, test_file, org_name, nil, is_temporary)
+      res.data
+    end
+  end
+
+  def delete_project(project_id, task_id = nil)
+    VCR.use_cassette("project_delete_#{task_id.to_s}") do
+      res = Veye::API::Project.delete_project(@api_key, project_id)
+      res.data
+    end
   end
 
   def test_get_list_api_call
     VCR.use_cassette('project_list') do
-      res = Veye::API::Project.get_list(@api_key)
+      res = Veye::API::Project.get_list(@api_key, @org_name)
 
       assert_equal 200, res.code
       assert_equal true, res.success
 
       proj = res.data.first
-      assert_equal "bugtraqer", proj["name"]
-      assert_equal "lein_project_clj_1", proj["project_key"]
-      assert_equal "Lein", proj["project_type"]
+      assert_equal "OpenEJB :: Maven Plugins", proj["name"]
+      assert_equal "Maven2", proj["project_type"]
       assert_equal false, proj["public"]
-      assert_equal "upload", proj["source"]
+      assert_equal "API", proj["source"]
     end
   end
 
@@ -39,11 +60,11 @@ class ProjectTest < Minitest::Test
 
   def test_upload_api_call_when_file_exists
     VCR.use_cassette('project_upload') do
-      res = Veye::API::Project.upload(@api_key, @test_file)
+      res = Veye::API::Project.upload(@api_key, @test_file, @org_name)
       refute_nil res
       assert_equal 201, res.code
       assert_equal true, res.success
-      assert_equal "maven2_openejb_maven_plugins_1", res.data["project_key"]
+      assert_equal @project_key, res.data['id']
       assert_equal "OpenEJB :: Maven Plugins", res.data["name"]
       assert_equal "Maven2", res.data["project_type"]
       assert_equal true, res.data["public"]
@@ -51,20 +72,44 @@ class ProjectTest < Minitest::Test
     end
   end
 
+  def test_upload_attaches_optional_arguments
+    VCR.use_cassette('project_upload_with_args') do
+      res = Veye::API::Project.upload(@api_key, @test_file, @org_name, @team_name, true, false, 'nipitiri')
+      refute_nil res
+
+      assert_equal 201, res.code
+      assert_equal true, res.success
+      assert_equal 'nipitiri', res.data['name']
+      assert_equal false, res.data['public']
+    end
+  end
+
+  
   def test_update_api_call
+    proj_dt = {}
+    VCR.use_cassette('project_upload_for_update') do
+      res = Veye::API::Project.upload(@api_key, @test_file, @org_name, @team_name, false)
+      refute_nil res
+      proj_dt = res.data
+    end
+
     VCR.use_cassette('project_update') do
-      res = Veye::API::Project.update(@api_key, @project_key, @test_file)
+      res = Veye::API::Project.update(@api_key, proj_dt['id'], @test_file)
       refute_nil res
       assert_equal 201, res.code
       assert_equal true, res.success
       proj = res.data
-      assert_equal @project_key, proj["project_key"]
+      assert_equal proj_dt['id'], proj["id"]
       assert_equal "OpenEJB :: Maven Plugins", proj["name"]
       assert_equal "Maven2", proj["project_type"]
       assert_equal true, proj["public"]
       assert_equal "API", proj["source"]
       assert_equal 11, proj["dependencies"].count
     end
+
+    VCR.use_cassette('project_delete_for_update') do
+      Veye::API::Project.delete_project(@api_key, proj_dt['id'])
+    end
   end
 
   def test_get_project_api_call
@@ -75,7 +120,7 @@ class ProjectTest < Minitest::Test
       assert_equal 200, res.code
 
       proj = res.data
-      assert_equal @project_key, proj["project_key"]
+      assert_equal @project_key, proj["id"]
       assert_equal "OpenEJB :: Maven Plugins", proj["name"]
       assert_equal "Maven2", proj["project_type"]
       assert_equal true, proj["public"]
@@ -99,20 +144,39 @@ class ProjectTest < Minitest::Test
 
   def test_get_licenses_api_call
     VCR.use_cassette('project_license') do
-      res = Veye::API::Project.get_licenses(@api_key, 'rubygem_gemfile_lock_1')
+      res = Veye::API::Project.get_licenses(@api_key, @project_key)
       assert_equal 200, res.code
       assert_equal true, res.success
       assert_equal true, res.data["success"]
 
       licenses = res.data["licenses"]
-      unknown_license = licenses["unknown"].first
-      assert_equal({"name" => "gli" , "prod_key" => "gli" }, unknown_license)
-
-      ruby_license = licenses["Ruby"].first
-      assert_equal({ "name" => "json" , "prod_key" => "json"}, ruby_license)
+      apache_license = licenses["Apache-2.0"].first
+      assert_equal({
+        "name" => "maven-plugin-annotations",
+        "prod_key" => "org.apache.maven.plugin-tools/maven-plugin-annotations"
+      }, apache_license)
     end
   end
 
+  def test_merge_api_call
+    #upload 2projects
+    parent_id = upload_project(@test_file, false, 'merge_parent')['id']
+    child_id  = upload_project(@test_file2, false, 'merge_child')['id']
+    
+    VCR.use_cassette('project_merge') do
+      res = Veye::API::Project.merge(@api_key, parent_id, child_id)
+      assert_equal true, res.success
+      assert_equal true, res.data['success']
+    end
 
+    VCR.use_cassette('project_unmerge') do
+      res = Veye::API::Project.unmerge(@api_key, parent_id, child_id)
+      assert_equal true, res.success
+      assert_equal true, res.data['success']
+    end
+    #delete projects
+    delete_project(parent_id, 'merge_parent')
+    delete_project(child_id, 'merge_child')
+  end
 
 end