veye 0.2.1 → 0.3.0

data/test/github_delete_test.rb

@@ -6,7 +6,7 @@ class GithubDeleteTest < Minitest::Test
     @api_key = ENV['VEYE_API_KEY']
     @repo_name = 'versioneye/veye'
     @branch = "master"
-    @opts = {branch: @branch}
+    @filename = 'Gemfile.lock'
 
     import_project
   end
@@ -14,14 +14,16 @@ class GithubDeleteTest < Minitest::Test
   def import_project
     #import project before testing
     VCR.use_cassette('github_import') do
-      Veye::API::Github.import_repo(@api_key, @repo_name, @branch, 'Gemfile.locl')
+      res = Veye::API::Github.import_repo(@api_key, @repo_name, @branch, @filename)      
+
+      refute_nil res, "Import failed"
     end
   end
 
   def test_delete_default
     VCR.use_cassette('github_delete') do
       res = capture_stdout do 
-        Veye::Github::Delete.delete_repo(@api_key, @repo_name, @opts)
+        Veye::Github::Delete.delete_repo(@api_key, @repo_name, @branch, {})
       end
 
       refute_nil res, "No command output"

data/test/github_import_test.rb

@@ -7,51 +7,46 @@ class GithubImportTest < Minitest::Test
     @api_key = ENV['VEYE_API_KEY']
     @repo_name = 'versioneye/veye'
     @branch = "master"
-    @file = "Gemfile.lock"
-
-    @opts = {
-      file: @file,
-      branch: @branch
-    }
+    @filename = "Gemfile.lock"
   end
 
   def test_import_default
     VCR.use_cassette('github_import') do
       res = capture_stdout do
-        Veye::Github::Import.import_repo(@api_key, @repo_name, @opts)
+        Veye::Github::Import.import_repo(@api_key, @repo_name, @branch, @filename)
       end
 
       refute_nil res, "Command output was nil"
       rows = res.split(/\n/)
       assert_equal "\t\e[32mversioneye/veye\e[0m - \e[1mruby\e[0m", rows[0]
-      assert_equal "\tDescription    : VersionEye command line tool ", rows[1]
+      assert_equal "\tDescription    : VersionEye command line tool implemented in Ruby", rows[1]
       assert_equal "\tOwner login    : versioneye", rows[2]
       assert_equal "\tOwner type     : organization", rows[3]
       assert_equal "\tPrivate        : false", rows[4]
       assert_equal "\tFork           : false", rows[5]
       assert_equal "\tBranches       : ", rows[6]
-      assert_equal "\tImported       : rubygem_versioneye_veye_1", rows[7]
     end
   end
 
   def test_import_csv
     VCR.use_cassette('github_import') do
       res = capture_stdout do
-        Veye::Github::Import.import_repo(@api_key, @repo_name, @opts.merge({format: 'csv'}))
+        Veye::Github::Import.import_repo(@api_key, @repo_name, @branch, @filename, {format: 'csv'})
       end
 
       refute_nil res, "Command output was nil"
       dt = CSV.parse(res)
       assert_equal ["name", "language", "owner_login", "owner_type", "private", "fork", "branches", "imported_projects", "description"], dt[0]
       assert_equal ["versioneye/veye", "ruby", "versioneye", "organization", "false"], dt[1].take(5)
-      assert_equal ["false", nil, "rubygem_versioneye_veye_1", "VersionEye command line tool "], dt[1].drop(5)
+      assert_equal ["false", nil, '57c3f017864739000eca5357|57c3f39712b5260016707bea',
+                    "VersionEye command line tool implemented in Ruby"], dt[1].drop(5)
     end
   end
 
   def test_import_json
     VCR.use_cassette('github_import') do
       res = capture_stdout do
-        Veye::Github::Import.import_repo(@api_key, @repo_name, @opts.merge({format: 'json'}))
+        Veye::Github::Import.import_repo(@api_key, @repo_name, @branch, @filename, {format: 'json'})
       end
 
       refute_nil res, "No command output"
@@ -68,7 +63,6 @@ class GithubImportTest < Minitest::Test
 
       refute_nil dt["projects"]
       project = dt["projects"].first
-      assert_equal "rubygem_versioneye_veye_1", project["project_key"]
       assert_equal "versioneye/veye", project["name"]
       assert_equal "RubyGem", project["project_type"]
       assert_equal true, project["public"]
@@ -79,7 +73,7 @@ class GithubImportTest < Minitest::Test
   def test_import_table
     VCR.use_cassette('github_import') do
       res = capture_stdout do
-        Veye::Github::Import.import_repo(@api_key, @repo_name, @opts.merge({format: 'table'}))
+        Veye::Github::Import.import_repo(@api_key, @repo_name, @branch, @filename, {format: 'table'})
       end
 
       refute_nil res, "No command output"
@@ -88,7 +82,6 @@ class GithubImportTest < Minitest::Test
       assert_match(/\| name\s+\| language \| owner_login \| owner_type\s+\| private \| fork\s+\|/ , rows[3])
       assert_match(/branches \| imported_projects\s+\| description\s+\|/, rows[3])
       assert_match(/\| versioneye \| veye | ruby\s+\| versioneye  \| organization \| false/, rows[5])
-      assert_match(/\| false \|\s+\| rubygem_versioneye_veye_1 \| VersionEye command line tool\s+\|/, rows[5])
     end
   end
 end

data/test/github_info_test.rb

@@ -17,7 +17,7 @@ class GithubInfoTest < Minitest::Test
       refute_nil output
       rows = output.split(/\n/)
       assert_equal "\t\e[32mversioneye/veye\e[0m - \e[1mruby\e[0m", rows[0]
-      assert_equal "\tDescription    : VersionEye command line tool ", rows[1]
+      assert_equal "\tDescription    : VersionEye command line tool implemented in Ruby" , rows[1]
       assert_equal "\tOwner login    : versioneye", rows[2]
       assert_equal "\tOwner type     : organization", rows[3]
       assert_equal "\tPrivate        : false", rows[4]
@@ -37,7 +37,7 @@ class GithubInfoTest < Minitest::Test
       assert_equal ["name", "language", "owner_login", "owner_type", "private", "fork", "branches", "imported_projects", "description"], rows[0]
       assert_equal(
         ["versioneye/veye", "ruby", "versioneye", "organization", "false", "false",
-         nil, nil, "VersionEye command line tool "],
+         nil, nil, "VersionEye command line tool implemented in Ruby"],
         rows[1]
       )
     end

data/test/package_follow_test.rb

@@ -9,7 +9,7 @@ class PackageFollowTest < MiniTest::Test
   def test_get_follow_status
     VCR.use_cassette('package_follow_status') do
       out = capture_stdout do
-        Veye::Package::Follow.get_follow_status(@api_key, 'ruby/ruby')
+        Veye::Package::Follow.get_follow_status(@api_key, 'ruby', 'ruby')
       end
       expected = "Following `ruby`: \e[32mfalse\e[0m\n"
       assert_equal expected, out
@@ -19,7 +19,7 @@ class PackageFollowTest < MiniTest::Test
   def test_follow
     VCR.use_cassette('package_follow') do
       out = capture_stdout do
-        Veye::Package::Follow.follow(@api_key, 'ruby/ruby')
+        Veye::Package::Follow.follow(@api_key, 'ruby', 'ruby')
       end
       expected = "Following `ruby`: \e[32mtrue\e[0m\n"
       assert_equal expected, out
@@ -29,7 +29,7 @@ class PackageFollowTest < MiniTest::Test
   def test_unfollow
     VCR.use_cassette('package_unfollow') do
       out = capture_stdout do
-        Veye::Package::Follow.unfollow(@api_key, 'ruby/ruby')
+        Veye::Package::Follow.unfollow(@api_key, 'ruby', 'ruby')
       end
       expected = "Following `ruby`: \e[32mfalse\e[0m\n"
       assert_equal expected, out

data/test/package_info_test.rb

@@ -8,14 +8,14 @@ class PackageInfoTest < Minitest::Test
   end
 
   def test_info_default
-    VCR.use_cassette('package_info') do
+    VCR.use_cassette('package_info_default') do
       output = capture_stdout do
-        Veye::Package::Info.get_package(@api_key, 'ruby/veye')
+        Veye::Package::Info.get_package(@api_key, 'veye', 'ruby')
       end
       refute_nil output, "No command output"
 
       rows = output.split(/\n/)
-      assert_equal "\t\e[32m\e[1mveye\e[0m - \e[1m0.1.1\e[0m", rows[0]
+      assert_match(/\t\e\[32m\e\[1mveye\e\[0m/ , rows[0])
       assert_equal "\tLanguage       : ruby", rows[1]
       assert_equal "\tLicense        : MIT", rows[2]
       assert_equal "\tProduct type   : RubyGem", rows[3]
@@ -24,36 +24,37 @@ class PackageInfoTest < Minitest::Test
   end
 
   def test_info_csv_format
-    VCR.use_cassette('package_info') do
+    VCR.use_cassette('package_info_versioned') do
       output = capture_stdout do
-        Veye::Package::Info.get_package(@api_key, 'ruby/veye', {format: 'csv'})
+        Veye::Package::Info.get_package(@api_key, 'veye', 'ruby', '0.2.1', {format: 'csv'})
       end
-
       refute_nil output, "No command output"
+      
       rows = CSV.parse(output)
-      assert_equal ["name", "version", "language", "prod_key", "licence", "prod_type", "description", "link"], rows[0]
-      assert_equal ["veye", "0.1.1", "ruby", "veye", nil, "RubyGem", nil, nil], rows[1]
+      assert_equal ["name", "version", "language", "prod_key", "licence", "prod_type", "description", "link", 'cves'], rows[0]
+      assert_equal ["veye", "0.2.1", "ruby", "veye", nil, "RubyGem"], rows[1].take(6)
     end
   end
 
   def test_info_json_format
-    VCR.use_cassette('package_info') do
+    VCR.use_cassette('package_info_versioned') do
       output = capture_stdout do
-        Veye::Package::Info.get_package(@api_key, 'ruby/veye', {format: 'json'})
+        Veye::Package::Info.get_package(@api_key, 'veye', 'ruby', '0.2.1', {format: 'json'})
       end
+
       refute_nil output
       dt = JSON.parse(output)
       package = dt["package"]
       assert_equal "veye", package["name"]
       assert_equal "ruby", package["language"]
       assert_equal "veye", package["prod_key"]
-      assert_equal "0.1.1", package["version"]
+      assert_match(/\d+\.\d+\.\d+/, package["version"])
       assert_equal "RubyGem", package["prod_type"]
       assert_equal "MIT", package["license_info"]
 
       dep = package["dependencies"].first
       assert_equal "awesome_print", dep["name"]
-      assert_equal ">= 1.6", dep["version"]
+      assert_equal "~> 1.6", dep["version"]
 
       license = package["licenses"].first
       assert_equal "MIT", license["name"]
@@ -62,15 +63,15 @@ class PackageInfoTest < Minitest::Test
   end
 
   def test_info_table_format
-    VCR.use_cassette('package_info') do
+    VCR.use_cassette('package_info_versioned') do
       output = capture_stdout do
-        Veye::Package::Info.get_package(@api_key, 'ruby/veye', {format: 'table'})
+        Veye::Package::Info.get_package(@api_key, 'veye', 'ruby', '0.2.1', {format: 'table'})
       end
       refute_nil output, "No command output"
       rows = output.split(/\n/)
       assert_match(/\|\s+Package information\s+\|/, rows[1])
       assert_match(/\| name \| version \| product_key \| language \| license \| description/, rows[3])
-      assert_match(/\| veye \| 0.0.9   \| veye\s+\| ruby\s+| MIT\s+\|/, rows[5])
+      assert_match(/\| veye \| 0.2.1   \| veye\s+\| ruby\s+| MIT\s+\|/, rows[5])
     end
   end
 end

data/test/package_reference_test.rb

@@ -10,7 +10,7 @@ class PackageReferenceTest < MiniTest::Test
   def test_reference_with_results
     VCR.use_cassette('package_reference') do
       output = capture_stdout do
-        Veye::Package::References.get_references(@api_key, 'ruby/ruby', {})
+        Veye::Package::References.get_references(@api_key, 'ruby', 'ruby', {})
       end
       refute_nil output, "Command output was nil"
       rows = output.split(/\n/)
@@ -25,7 +25,7 @@ class PackageReferenceTest < MiniTest::Test
   def test_reference_csv_format
     VCR.use_cassette('package_reference') do
       output = capture_stdout do
-        Veye::Package::References.get_references(@api_key, 'ruby/ruby', {format: 'csv'})
+        Veye::Package::References.get_references(@api_key, 'ruby', 'ruby', {format: 'csv'})
       end
       refute_nil output, "Command output was nil"
       rows = CSV.parse(output)
@@ -37,7 +37,7 @@ class PackageReferenceTest < MiniTest::Test
   def test_reference_json_format
     VCR.use_cassette('package_reference') do
       output = capture_stdout do
-        Veye::Package::References.get_references(@api_key, 'ruby/ruby', {format: 'json'})
+        Veye::Package::References.get_references(@api_key, 'ruby', 'ruby', {format: 'json'})
       end
       refute_nil output, "Command output was nil"
       dt = JSON.parse(output)
@@ -53,7 +53,7 @@ class PackageReferenceTest < MiniTest::Test
   def test_reference_table_format
     VCR.use_cassette('package_reference') do
       output = capture_stdout do
-        Veye::Package::References.get_references(@api_key, 'ruby/ruby', {format: 'table'})
+        Veye::Package::References.get_references(@api_key, 'ruby', 'ruby', {format: 'table'})
       end
       refute_nil output, "Command output was nil"
       rows = output.split(/\n/)

data/test/package_search_test.rb

@@ -16,7 +16,7 @@ class PackageSearchTest < MiniTest::Test
       rows = output.split(/\n/)
       assert_equal "  1 - \e[32m\e[1mveye\e[0m", rows[0]
       assert_equal "\tProduct key    : veye", rows[1]
-      assert_equal "\tLatest version : \e[32m\e[1m0.1.1\e[0m", rows[2]
+      assert_equal "\tLatest version : \e[32m\e[1m0.2.1\e[0m", rows[2]
       assert_equal "\tLanguage       : ruby", rows[3]
     end
   end
@@ -30,7 +30,7 @@ class PackageSearchTest < MiniTest::Test
 
       rows = CSV.parse(output)
       assert_equal ["nr", "name", "version", "prod_key", "language", "group_id"], rows[0]
-      assert_equal ["1", "veye", "0.1.1", "veye", "ruby", nil], rows[1]
+      assert_equal ["1", "veye", "0.2.1", "veye", "ruby", nil], rows[1]
     end
   end
 
@@ -46,7 +46,7 @@ class PackageSearchTest < MiniTest::Test
       assert_equal "veye", res["name"]
       assert_equal "ruby", res["language"]
       assert_equal "veye", res["prod_key"]
-      assert_equal "0.1.1", res["version"]
+      assert_equal "0.2.1", res["version"]
       assert_equal "RubyGem", res["prod_type"]
     end
   end
@@ -61,7 +61,7 @@ class PackageSearchTest < MiniTest::Test
       rows = output.split(/\n/)
       assert_match(/\|\s+Package search\s+\|/, rows[1])
       assert_match(/\| index \| name \| version \| product_key \| language \|/, rows[3])
-      assert_match(/\| 1\s+\| veye \| 0.1.1\s+\| veye\s+\| ruby\s+\|/, rows[5])
+      assert_match(/\| 1\s+\| veye \| 0.2.1\s+\| veye\s+\| ruby\s+\|/, rows[5])
     end
   end
 end

data/test/package_versions_test.rb

@@ -0,0 +1,73 @@
+require 'test_helper'
+require 'csv'
+require 'json'
+
+class PackageVersionsTest < Minitest::Test
+  def setup
+    init_environment
+    @api_key = ENV['VEYE_API_KEY']
+  end
+
+  def test_versions_default
+    VCR.use_cassette('package_versions') do
+      output = capture_stdout do
+        Veye::Package::Versions.get_list(@api_key, 'ruby', 'ruby', 10, 0, {})
+      end
+      refute_nil output, 'No response from the API'
+
+      rows = output.split(/\n/)
+      assert_equal "\t\e[32m\e[1mruby\e[0m - \e[1m0.1.0\e[0m", rows[0]
+      assert_equal "\tLanguage       : ruby", rows[1]
+      assert_equal "\tProduct type   : RubyGem", rows[2]
+      assert_equal "\tProduct key    : ruby", rows[3]
+      assert_equal "\tShowing items  : 10 after skipping 0 items", rows[4]
+      assert_equal "\t0.1.0          : 1\t2011-02-28T10:00:00.000+00:00", rows[5]
+    end
+  end
+
+  def test_versions_csv_format
+    VCR.use_cassette('package_versions') do
+      output = capture_stdout do
+        Veye::Package::Versions.get_list(@api_key, 'ruby', 'ruby', 10, 0, {format: 'csv'})
+      end
+      refute_nil output, "No API response"
+
+      rows = CSV.parse(output)
+      assert_equal ['nr', 'version', 'language', 'prod_key', 'prod_type', 'released_at'], rows[0]
+      assert_equal ['1', '0.1.0', 'ruby', 'ruby', 'RubyGem', '2011-02-28T10:00:00.000+00:00'], rows[1]
+    end
+  end
+
+  def test_versions_json_format
+    VCR.use_cassette('package_versions') do
+      output = capture_stdout do
+        Veye::Package::Versions.get_list(@api_key, 'ruby', 'ruby', 10, 0, {format: 'json'})
+      end
+      refute_nil output, 'No API response'
+      
+      dt = JSON.parse output
+      assert_equal 'ruby', dt['results']['prod_key']
+      assert_equal 'ruby', dt['results']['language']
+      assert_equal '0.1.0', dt['results']['versions'].first['version']
+      assert_equal 10, dt['pagination']['n']
+      assert_equal 0, dt['pagination']['from']
+    end
+
+  end
+  
+  def test_version_table_format
+    VCR.use_cassette('package_versions') do
+      output = capture_stdout do
+        Veye::Package::Versions.get_list(@api_key, 'ruby', 'ruby', 10, 0, {format: 'table'})
+      end
+      refute_nil output, 'No API response'
+
+      rows = output.split(/\n/)
+
+      assert_match(/package versions/i, rows[1])
+      assert_match(/| nr | name | version | released_at\s+|\s+product_key/i, rows[3])
+      assert_match(/| 1  | ruby | 0.1.0   | 2011-02-28T10:00:00.000+00:00 | ruby/i, rows[5])
+    end
+  end
+
+end