veye 0.1.1 → 0.2

data/lib/veye/project/check.rb

@@ -1,5 +1,5 @@
-require_relative '../views/project.rb'
-require_relative '../base_executor.rb'
+require_relative '../views/project'
+require_relative '../base_executor'
 
 module Veye
   module Project
@@ -25,69 +25,82 @@ module Veye
 
       def self.get_list(api_key, options)
         results = Veye::API::Project.get_list(api_key)
-        catch_request_error(results, 'Can not read list of projects.')
+        valid_response?(results, 'Can not read list of projects.')
         show_results(@output_formats, results.data, options)
       end
 
-      def self.upload(filename, api_key, options)
-        results = Veye::API::Project.upload(api_key, filename)
-        catch_request_error(results, 'Upload failed.')
+      def self.get_project(api_key, project_key, options)
+        results = Veye::API::Project.get_project(api_key, project_key)
+        err_msg = "No data for the project: `#{project_key}`"
+        valid_response?(results, err_msg)
         show_results(@output_formats, results.data, options)
-        show_dependencies(results.data, options)
+        if options[:format] != 'json'
+          show_dependencies(@dependency_output_formats, results.data, options)
+        end
       end
 
-      def self.update(project_key, filename, api_key, options)
-        results = Veye::API::Project.update(api_key, project_key, filename)
-        catch_request_error(results, 'Re-upload failed.')
+      def self.upload(api_key, filename, options)
+        results = Veye::API::Project.upload(api_key, filename)
+        valid_response?(results, 'Upload failed.')
         show_results(@output_formats, results.data, options)
-        show_dependencies(results.data, options)
+        if options[:format] != 'json'
+          show_dependencies(@dependency_output_formats, results.data, options)
+        end
       end
 
-      def self.get_project(project_key, api_key, options)
-        results = Veye::API::Project.get_project(api_key, project_key)
-        err_msg = "No data for the project: `#{project_key}`"
-        catch_request_error(results, err_msg)
+      def self.update(api_key, project_key, filename, options)
+        results = Veye::API::Project.update(api_key, project_key, filename)
+        valid_response?(results, 'Re-upload failed.')
         show_results(@output_formats, results.data, options)
-        show_dependencies(results.data, options)
+        if options[:format] != 'json'
+          show_dependencies(@dependency_output_formats, results.data, options)
+        end
       end
 
-      def self.delete_project(project_key, api_key)
-        results = Veye::API::Project.delete_project(api_key, project_key)
-        err_msg = "Failed to delete project: `#{project_key}`"
-        catch_request_error(results, err_msg)
-        show_message(results, 'Deleted', 'Cant delete.')
-      end
+      #checks project file and initializes veye.json file iff it's missing
+      #files - an array with filenames to check, ['Gemfile', 'bower.json']
+      #path - nil or string, a relative path to the project root directory
+      def self.check(api_key, path, files, options)
+        project_settings = Veye::Settings.load(path)
+        #initialize project settings to keep various project specific data
+        if project_settings.nil?
+          file_map = files.to_a.inject({}) {|acc, x| acc.store(x, nil); acc}
+          opts = {'projects' => file_map}
+          project_settings = Veye::Settings.init(path, opts)
+        end
 
-      #-- layout helpers
-      def self.filter_dependencies(results, options)
-        if options[:all]
-           results['dependencies'].to_a.sort_by {|x| x['outdated'].hash}
-         else
-           results['dependencies'].to_a.keep_if {|x| x['outdated']}
-         end
-      end
-      
-      def self.show_dependencies(results, options)
-        format = options[:format]
-        format ||= 'pretty'
-        return if format == 'json'
-        self.supported_format?(@dependency_output_formats, format)
+        unless project_settings.has_key?('projects')
+          printf "veye.json is malformed - missing `project` key".color(:red)
+          exit 0
+        end
 
-        deps = filter_dependencies(results, options)     
-        formatter = @dependency_output_formats[format]
-        formatter.before
-        formatter.format deps
-        formatter.after
+        deps = {}
+        project_settings['projects'].each do |filename, project_id|
+          filepath = "#{path}/#{filename}"
+          results = if project_id.nil?
+                      Veye::API::Project.upload(api_key, filepath)
+                    else
+                      Veye::API::Project.update(api_key, project_id, filepath)
+                    end
+          error_msg = "Failed to check dependencies for `#{filename.to_s.color(:red)}`"
+          if valid_response?(results, error_msg)
+            deps[filename] = results.data
+            project_settings['projects'].store(filename, results.data['project_key'])
+          else
+            deps[filename] = {error: "Failed to check a file `#{filepath}`"}
+          end
+        end
+
+        Veye::Settings.dump(path, project_settings)
+        #show_results(@output_formats, deps, options)
+        show_bulk_dependencies(@dependency_output_formats, deps, options)
       end
 
-      def self.show_message(results, success_msg, fail_msg)
-        if results.success
-          printf "#{success_msg}\n".color(:green)
-        else
-          printf("Error: %s\n%s\n",
-                 fail_msg.color(:red),
-                 response.data['error'])
-        end
+      def self.delete_project(api_key, project_key)
+        results = Veye::API::Project.delete_project(api_key, project_key)
+        err_msg = "Failed to delete project: `#{project_key}`"
+        valid_response?(results, err_msg)
+        show_message(results, 'Deleted', 'Cant delete.')
       end
     end
   end

data/lib/veye/project/license.rb

@@ -12,7 +12,7 @@ module Veye
         'table'   => Project::LicenceTable.new
       }
 
-      def self.get_licenses(project_key, api_key, options)
+      def self.get_licenses(api_key, project_key, options)
         results = Veye::API::Project.get_licenses(api_key, project_key)
         err_msg = "Cant access a information for project `#{project_key}`."
         catch_request_error(results, err_msg)

data/lib/veye/project.rb

@@ -6,5 +6,31 @@ module Veye
   # projects on VersionEye and presenting results
   # on command line.
   module Project
+    @supported_files = [
+      'project\.clj', 'bower\.json', 'project\.json', 'gemfile',
+      'gemfile\.lock', '*\.gradle', '*\.sbt', '*\.pom\.xml', 'podfile'
+    ]
+
+    def self.supported_files
+      @supported_files
+    end
+
+    def self.supported?(filename)
+      @supported_files.any? {|ptrn| filename.to_s.downcase.match(/^#{ptrn}$/) }  
+    end
+
+    #returns list of supported filenames in the working folder
+    def self.get_files(path)
+      files = Set.new
+      Dir.foreach(path) do |filename|
+        files << filename if supported?(filename)
+      end
+
+      if files.include?('Gemfile') and files.include?('Gemfile.lock')
+        files.delete 'Gemfile'
+      end
+
+      files
+    end
   end
 end

data/lib/veye/settings.rb

@@ -0,0 +1,50 @@
+require 'json'
+
+module Veye
+
+  #This class includes methods to manage project specific
+  # settings to make it recurrent usage simpler for users
+  class Settings
+    @filename = "veye.json"
+    @default_options = {
+      projects: {} #file_name : project_key
+    }
+
+    def self.filename
+      @filename
+    end
+
+    def self.default_options
+      @default_options
+    end
+
+    def self.file_fullpath(path)
+      path ||= Dir.pwd
+      file_path = "#{path}/#{@filename}"
+      File.absolute_path(file_path)
+    end
+
+    #read config file from current working directory
+    #it returns nil if settings file doesnt exists or not readable
+    #otherwise it returns a map of settings
+    def self.load(path)
+      file_path = file_fullpath(path)
+      return unless File.exist?(file_path)
+      JSON.load(File.open(file_path, 'r'))
+    end
+
+    #saves map of options into settings file
+    #ps: it overwrites whole content in settings file
+    def self.dump(path, options)
+      file_path = file_fullpath(path)
+      File.open(file_path, 'w') {|f| f.write(options.to_json) }
+    end
+
+    #initializes default VersionEye settings file and saves it into the file
+    def self.init(path, options)
+      opts = @default_options.merge(options)
+      dump(path, opts)
+      opts
+    end
+  end
+end

data/lib/veye/version.rb

@@ -1,5 +1,5 @@
 module Veye
-  VERSION = '0.1.1'
+  VERSION = '0.2'
   BIGEYE = %q{
 
       _    __                   _                ______

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

@@ -28,8 +28,7 @@ module Veye
         printf("\t%-15s: %s\n", "Imported", project_names.join(', '))
         printf("\t%-15s: %s\n", "Html url", repo['html_url'])
         printf("\t%-15s: %s\n", "Git url", repo['git_url'])
-
-     end
+      end
     end
   end
 end

data/lib/veye/views/github/search_pretty.rb

@@ -13,7 +13,7 @@ module Veye
         printf(
           "%3d - %s\n",
           index + 1,
-          "#{result["name"]}".color(:green).bright
+          "#{result["name"]}".color(:green)
         )
         printf("\t%-15s: %s\n", 'language', result['language'])
         printf("\t%-15s: %s\n", 'owner_name', result['owner_name'])

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

@@ -10,11 +10,11 @@ module Veye
         items.each_with_index do |result, index|
           printf("%3d - %s\n",
                  index + 1,
-                 "#{result["name"]}".color(:green).bright)
+                 "#{result["name"]}".color(:green))
           printf("\t%-15s: %s\n", "Product key", result["prod_key"].bright)
           printf("\t%-15s: %s\n", "Product type", "#{result['prod_type']}")
           printf("\t%-15s: %s\n", "Language", result["language"])
-          printf("\t%-15s: %s\n", "Version", "#{result['version']}".bright)
+          printf("\t%-15s: %s\n", "Version", "#{result['version']}".color(:green))
        end
 
       end

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

@@ -4,27 +4,47 @@ module Veye
   module Project
     class DependencyCSV < BaseCSV
       def initialize
-        headings = "nr,name,prod_key,outdated,version_current,version_requested,stable,license"
+        headings = "nr,name,prod_key,outdated,current,requested,stable,licenses"
         super(headings)
       end
 
-      def format(results)
+      def format(results, filename = nil)
         return nil if results.nil?
         results = [results] if results.is_a?(Hash)
 
         results.each_with_index do |result, index|
-            printf("%d,%s,%s,%s,%s,%s,%s,%s\n",
-                   index + 1,
-                   result['name'],
-                   result['prod_key'],
-                   result['outdated'],
-                   result['version_current'],
-                   result['version_requested'],
-                   result['stable'],
-                   result['license']
-                 )
+          if filename.nil?
+            print_line(result, index + 1)
+          else
+            print_line_with_filename(result, index + 1, filename)
+          end
         end
       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(';'))
+      end
+
+      def print_line_with_filename(result, i, filename)
+        printf("%d,%s,%s,%s,%s,%s,%s,%s,%s\n",
+               i, filename,
+               result['name'],
+               result['prod_key'],
+               result['outdated'],
+               result['version_current'],
+               result['version_requested'],
+               result['stable'],
+               result['licenses'].to_a.map {|x| x['name']}.join(';'))
+      end
+
     end
   end
 end

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

@@ -3,8 +3,12 @@ require_relative '../base_json.rb'
 module Veye
   module Project
     class DependencyJSON < BaseJSON
-      def format(results)
-        @results[:repo] = results['repo']
+      def format(results, filename = nil)
+        if filename.nil?
+          @results[:repo] = results['repo']
+        else
+          @results[filename] = results
+        end
       end
     end
   end

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

@@ -3,23 +3,31 @@ require_relative '../base_pretty.rb'
 module Veye
   module Project
     class DependencyPretty < BasePretty
-      def format(results)
+      def format(results, filename = nil)
         return if results.nil?
         results = [results] if results.is_a?(Hash)
+        printf("#-- Dependencies ------------------------------------------\n")
         results.each_with_index do |result, index|
           project_name = "#{result['name']}".color(:green).bright
           printf("%3d - %s\n", index + 1, project_name)
+          #shows project file names
+          if filename
+            printf("\t%-15s: %s\n", "Sourcefile", filename)
+          end
+
           printf("\t%-15s: %s\n", "Product key", result["prod_key"])
 
           color_code = (result["outdated"] == true) ? :red : :green
-          printf("\t%-15s: %s\n", "Outdated",
-                                  "#{result['outdated']}".color(color_code))
+          printf("\t%-15s: %s\n",
+                 "Outdated",
+                 "#{result['outdated']}".color(color_code))
+
+          printf("\t%-15s: %s\n", "Current", "#{result['version_current']}".color(color_code))
 
-          printf("\t%-15s: %s\n", "Current version",
-                                  "#{result['version_current']}".color(color_code))
+          printf("\t%-15s: %s\n", "Requested", result["version_requested"])
 
-          printf("\t%-15s: %s\n", "Requested version", result["version_requested"])
-          printf("\t%-15s: %s\n", "License", result["license"])
+          licenses = result["licenses"].to_a.map {|x| x['name']}
+          printf("\t%-15s: %s\n", "Licenses", licenses.join(', '))
 
         end
       end

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

@@ -7,18 +7,20 @@ module Veye
         headings = %w{index name prod_key version_current version_requested outdated stable license}
         super("Project dependencies", headings)
       end
-      def format(results)
+      def format(results, filename = nil)
         results = [results] if results.is_a?(Hash)
 
         results.each_with_index do |result, index|
-          row = [index + 1,
-            result["name"],
+          row = [
+            index + 1,
+            (filename or result["name"]),
             result["prod_key"],
             result["version_current"],
             result["version_requested"],
             result["outdated"] ? "outdated":"no",
             result["stable"] ? "stable": "unstable",
-            result["license"]]
+            result["licenses"].to_a.map {|x| x['name']}.join(',')
+          ]
           @table << row
         end
       end

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

@@ -11,7 +11,7 @@ module Veye
         results.each_with_index do |result, index|
           project_name = "#{result['name']}".color(:green).bright
           printf("%3d - %s\n", index + 1, project_name)
-          printf("\t%-15s: %s\n", "Project key", "#{result['project_key']}".bright)
+          printf("\t%-15s: %s\n", "Project key", "#{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

@@ -2,11 +2,12 @@ require_relative '../base_table.rb'
 
 module Veye
   module Project
-   class InfoTable < BaseTable
+    class InfoTable < BaseTable
       def initialize
         headings = %w(index name project_key private period source dependencies outdated created_at)
         super("List of projects", headings)
       end
+
       def format(results)
         return if results.nil?
         results = [results] if results.is_a? Hash
@@ -17,8 +18,8 @@ module Veye
                  result['dep_number'], result['out_number'], result['created_at']]
           @table << row
          end
-       end
-   end
+      end
+    end
   end
 end
 

data/lib/veye.rb

@@ -5,14 +5,15 @@ require 'yaml'
 
 require 'veye/helpers/format_helpers.rb'
 
-require 'veye/version.rb'
-require 'veye/service.rb'
-require 'veye/api.rb'
-require 'veye/package.rb'
-require 'veye/project.rb'
-require 'veye/user.rb'
-require 'veye/github.rb'
-require 'veye/pagination.rb'
+require 'veye/version'
+require 'veye/service'
+require 'veye/api'
+require 'veye/package'
+require 'veye/project'
+require 'veye/user'
+require 'veye/github'
+require 'veye/pagination'
+require 'veye/settings'
 
 $global_options ||= {}
 DEFAULT_CONFIG_FILE = '.veye.rc'

data/test/api/github_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 class GithubTest < Minitest::Test
   def setup
     init_environment
-    @api_key = 'ba7d93beb5de7820764e'
+    @api_key = ENV["VEYE_API_KEY"]
     @repo_name = 'versioneye/veye'
     @branch = "master"
     @file = "Gemfile.lock"

data/test/api/package_test.rb

@@ -3,12 +3,12 @@ require_relative '../test_helper'
 class PackageTest < Minitest::Test
   def setup
     init_environment
-    @api_key = "ba7d93beb5de7820764e"
+    @api_key = ENV["VEYE_API_KEY"]
   end
 
   def test_info_api_call
     VCR.use_cassette('package_info') do
-      res = Veye::API::Package::get_package('veye', 'ruby')
+      res = Veye::API::Package::get_package(@api_key, 'veye', 'ruby')
 
       assert_equal 200, res.code
       assert_equal true, res.success
@@ -20,7 +20,7 @@ class PackageTest < Minitest::Test
 
   def test_search_api_call
     VCR.use_cassette('package_search') do
-      res = Veye::API::Package.search('veye')
+      res = Veye::API::Package.search(@api_key, 'veye')
       refute_nil res
       assert_equal true, res.success
       assert_equal 200, res.code
@@ -68,11 +68,12 @@ class PackageTest < Minitest::Test
 
   def test_reference_api_call
     VCR.use_cassette('package_reference') do
-      res = Veye::API::Package.get_references('ruby', 'ruby')
+      res = Veye::API::Package.get_references(@api_key, 'ruby', 'ruby')
       refute_nil res
+
       assert_equal 200, res.code
       assert_equal true, res.success
-      assert_equal "acts_as_dasherize_vanity", res.data['results'].first.fetch("name", nil)
+      assert_equal "gitit", res.data['results'].first.fetch("name", nil)
     end
   end
 

data/test/api/project_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 class ProjectTest < Minitest::Test
   def setup
     init_environment
-    @api_key = 'ba7d93beb5de7820764e'
+    @api_key = ENV["VEYE_API_KEY"]
     @test_file = "test/files/maven-1.0.1.pom.xml"
     @project_key = "maven2_openejb_maven_plugins_1"
   end

data/test/api/user_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 class UserTest < Minitest::Test
   def setup
     init_environment
-    @api_key = "ba7d93beb5de7820764e"
+    @api_key = ENV["VEYE_API_KEY"]
   end
 
   def test_get_profile_api_call

data/test/fixtures/vcr_cassettes/github_delete.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: delete
-    uri: https://www.versioneye.com/api/v2/github/versioneye:veye?api_key=ba7d93beb5de7820764e&branch=master
+    uri: https://www.versioneye.com/api/v2/github/versioneye:veye?api_key=316dbd6b80b053f5b1e5&branch=master
     body:
       encoding: US-ASCII
       string: ''
@@ -21,28 +21,26 @@ http_interactions:
       Server:
       - nginx/1.4.6 (Ubuntu)
       Date:
-      - Fri, 14 Aug 2015 17:18:24 GMT
+      - Sat, 12 Mar 2016 18:45:38 GMT
       Content-Type:
       - application/json
       Content-Length:
       - '16'
       Connection:
       - keep-alive
-      Strict-Transport-Security:
-      - max-age=31536000
       Set-Cookie:
-      - api_key=ba7d93beb5de7820764e; secure
+      - api_key=316dbd6b80b053f5b1e5
       Etag:
       - W/"7363e85fe9edee6f053a4b319588c086"
       Cache-Control:
       - max-age=0, private, must-revalidate
       X-Request-Id:
-      - ada5986b-de47-4f47-9a78-32ad6620bd6d
+      - 3dc80523-b4a4-4112-90f6-bc99e3af1e0d
       X-Runtime:
-      - '0.173011'
+      - '0.269159'
     body:
       encoding: UTF-8
       string: '{"success":true}'
     http_version: 
-  recorded_at: Fri, 14 Aug 2015 17:18:15 GMT
-recorded_with: VCR 2.9.3
+  recorded_at: Sat, 12 Mar 2016 18:38:17 GMT
+recorded_with: VCR 3.0.1

data/test/fixtures/vcr_cassettes/github_info.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://www.versioneye.com/api/v2/github/versioneye:veye?api_key=ba7d93beb5de7820764e
+    uri: https://www.versioneye.com/api/v2/github/versioneye:veye?api_key=316dbd6b80b053f5b1e5
     body:
       encoding: US-ASCII
       string: ''
@@ -21,29 +21,27 @@ http_interactions:
       Server:
       - nginx/1.4.6 (Ubuntu)
       Date:
-      - Sun, 09 Aug 2015 08:24:50 GMT
+      - Sat, 12 Mar 2016 18:48:21 GMT
       Content-Type:
       - application/json
       Content-Length:
-      - '472'
+      - '453'
       Connection:
       - keep-alive
-      Strict-Transport-Security:
-      - max-age=31536000
       Set-Cookie:
-      - api_key=ba7d93beb5de7820764e; secure
+      - api_key=316dbd6b80b053f5b1e5
       Etag:
-      - W/"406a9cdb2b9d8e681a09871e01c96a18"
+      - W/"f66ca9e1f4d09b82bfe661be75934fe5"
       Cache-Control:
       - max-age=0, private, must-revalidate
       X-Request-Id:
-      - 2b7a1b05-fc6c-4cf6-97c8-104abf967792
+      - 6c3c14ee-5136-44ab-9446-e57a03d7dfb0
       X-Runtime:
-      - '0.045445'
+      - '0.050714'
     body:
       encoding: UTF-8
       string: '{"repo":{"name":"veye","fullname":"versioneye/veye","language":"ruby","owner_login":"versioneye","owner_type":"organization","description":"VersionEye
-        command line tool ","private":false,"fork":false,"branches":["master","references"],"git_url":"git://github.com/versioneye/veye.git","html_url":"https://github.com/versioneye/veye","created_at":"2012-12-27T11:15:03.000+00:00","cached_at":"2015-07-26T19:11:37.810+00:00","size":706,"homepage":null},"imported_projects":[]}'
+        command line tool ","private":false,"fork":false,"branches":null,"git_url":"git://github.com/versioneye/veye.git","html_url":"https://github.com/versioneye/veye","created_at":"2012-12-27T11:15:03.000+00:00","cached_at":"2016-02-24T10:25:53.782+00:00","size":832,"homepage":null},"imported_projects":[]}'
     http_version: 
-  recorded_at: Sun, 09 Aug 2015 08:22:18 GMT
-recorded_with: VCR 2.9.3
+  recorded_at: Sat, 12 Mar 2016 18:41:00 GMT
+recorded_with: VCR 3.0.1