veye 0.1.1 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60501b415687bde51f60775cfcf8170728a53bc4
-  data.tar.gz: 9bef96d3864260717b6af924d7f1318707a220e8
+  metadata.gz: 6c6d015ec997e45e2e4a94f7f7a7525165820f89
+  data.tar.gz: f50049bdfd288dc94b0917b5ebff5c2fd0f85b7b
 SHA512:
-  metadata.gz: f75ae699a67d76d8b1e64c43ce5c1d06c4c04d849ae9fa6665647aa06628dba609dba5a8b8ccaf2d5b77396c4f3e827ed968dfc19b3561f5514138cbbc6e3d53
-  data.tar.gz: 55c62bf5d811fa67e867c781ddc0e6b914c80f733c3bd9d961b9d41adac8de35ef91d401727443e946ca35ec47d6eec7573c17143f4cbb0fbf56c6dc77c3d541
+  metadata.gz: 0d61e89da5274ffccfa4423baecae93f7fe0c9ed5db0d5348d082b3542e98cb87ddb6a3a97dbda076a0f38d0d210345fbff7620e981e532388bb76c49bd29f13
+  data.tar.gz: 962c3c1ed75f123ca1fc9d641d40973c9255e6931e768771950ad13f68513cfd559d6642b9d5fc4374f19ad82cce38b62776a6bf899a0201d7e30d451460fea7

data/Gemfile.lock

@@ -1,109 +1,115 @@
 PATH
   remote: .
   specs:
-    veye (0.1.1)
-      awesome_print (>= 1.6)
-      contracts (>= 0.11)
-      gli (> 2.13)
-      rainbow (>= 2.0)
-      render-as-markdown
-      rest-client (>= 1.8)
-      terminal-table (>= 1.4)
+    veye (0.2)
+      awesome_print (~> 1.6)
+      contracts (~> 0.13)
+      gli (= 2.13.4)
+      rainbow (~> 2.0)
+      render-as-markdown (~> 0)
+      rest-client (~> 1.8)
+      terminal-table (~> 1.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.3.8)
+    addressable (2.4.0)
     ansi (1.5.0)
-    aruba (0.7.1)
-      childprocess (>= 0.3.6)
-      cucumber (>= 1.1.1)
-      rspec-expectations (>= 2.7.0)
-    ast (2.1.0)
-    astrolabe (1.3.1)
-      parser (~> 2.2)
+    aruba (0.14.0)
+      childprocess (~> 0.5.6)
+      contracts (~> 0.9)
+      cucumber (>= 1.3.19)
+      ffi (~> 1.9.10)
+      rspec-expectations (>= 2.99)
+      thor (~> 0.19)
+    ast (2.2.0)
     awesome_print (1.6.1)
     builder (3.2.2)
-    childprocess (0.5.6)
+    childprocess (0.5.9)
       ffi (~> 1.0, >= 1.0.11)
-    contracts (0.11.0)
-    crack (0.4.2)
+    contracts (0.13.0)
+    crack (0.4.3)
       safe_yaml (~> 1.0.0)
-    cucumber (2.0.0)
+    cucumber (2.3.2)
       builder (>= 2.1.2)
-      cucumber-core (~> 1.1.3)
+      cucumber-core (~> 1.4.0)
+      cucumber-wire (~> 0.0.1)
       diff-lcs (>= 1.1.3)
-      gherkin (~> 2.12)
+      gherkin (~> 3.2.0)
       multi_json (>= 1.7.5, < 2.0)
       multi_test (>= 0.1.2)
-    cucumber-core (1.1.3)
-      gherkin (~> 2.12.0)
+    cucumber-core (1.4.0)
+      gherkin (~> 3.2.0)
+    cucumber-wire (0.0.1)
     diff-lcs (1.2.5)
-    domain_name (0.5.24)
+    domain_name (0.5.20160309)
       unf (>= 0.0.5, < 1.0.0)
     ffi (1.9.10)
-    gherkin (2.12.2)
-      multi_json (~> 1.3)
-    gli (2.13.1)
+    gherkin (3.2.0)
+    gli (2.13.4)
+    hashdiff (0.3.0)
     http-cookie (1.0.2)
       domain_name (~> 0.5)
     json (1.8.3)
-    mime-types (2.6.1)
-    minitest (5.7.0)
-    minitest-reporters (1.0.17)
+    mime-types (2.99.1)
+    minitest (5.8.4)
+    minitest-reporters (1.1.8)
       ansi
       builder
       minitest (>= 5.0)
       ruby-progressbar
-    multi_json (1.11.1)
+    multi_json (1.11.2)
     multi_test (0.1.2)
-    netrc (0.10.3)
-    parser (2.2.2.6)
-      ast (>= 1.1, < 3.0)
+    netrc (0.11.0)
+    parser (2.3.0.6)
+      ast (~> 2.2)
     powerpack (0.1.1)
-    rainbow (2.0.0)
-    rake (10.4.2)
-    rdoc (4.2.0)
+    rainbow (2.1.0)
+    rake (11.1.0)
+    rdoc (4.2.2)
       json (~> 1.4)
     render-as-markdown (0.0.6)
     rest-client (1.8.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 3.0)
       netrc (~> 0.7)
-    rspec-expectations (3.3.0)
+    rspec-expectations (3.4.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-support (3.3.0)
-    rubocop (0.33.0)
-      astrolabe (~> 1.3)
-      parser (>= 2.2.2.5, < 3.0)
+      rspec-support (~> 3.4.0)
+    rspec-support (3.4.1)
+    rubocop (0.38.0)
+      parser (>= 2.3.0.6, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
-      ruby-progressbar (~> 1.4)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.7.5)
     safe_yaml (1.0.4)
     terminal-table (1.5.2)
+    thor (0.19.1)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.1)
-    vcr (2.9.3)
-    webmock (1.21.0)
+    unf_ext (0.0.7.2)
+    unicode-display_width (1.0.2)
+    vcr (3.0.1)
+    webmock (1.24.2)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
+      hashdiff
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  aruba (>= 0.7)
-  minitest (>= 5.7)
-  minitest-reporters (>= 1.0)
-  rake (>= 10.4)
+  aruba (~> 0.14)
+  minitest (~> 5.8)
+  minitest-reporters (~> 1.0)
+  rake (~> 11.1)
   rdoc (~> 4.2)
-  rubocop (>= 0.33)
-  vcr (>= 2.9)
+  rubocop (~> 0.38)
+  vcr (~> 3.0.1)
   veye!
-  webmock (>= 1.21)
+  webmock (~> 1.11)
 
 BUNDLED WITH
    1.10.5

data/README.md

@@ -193,7 +193,8 @@ All contributions are welcome - comments, new ideas, help with documentation & h
 
 
 ```
-$> rake test
+$> rm test/fixtures/vcr_cassettes/* #if needed
+$> VEYE_API_KEY=<YOUR_API_KEY> rake test
 $> rake test TEST=test/file_you_changed.rb
 ```
 

data/bin/veye

@@ -16,7 +16,7 @@ program_long_desc Rainbow(Veye::BIGEYE).green
 wrap_help_text :verbatim
 version Veye::VERSION
 
-COMMANDS_WITHOUT_API_KEY = [:help, :ping, :search]
+COMMANDS_WITHOUT_API_KEY = [:help, :ping]
 
 config_file '.veye.rc'
 
@@ -93,8 +93,9 @@ command :search do |c|
   c.action do |global_options, options, args|
     error_msg = "the search term is mandatory.".color(:red)
     help_now!(error_msg) if args.empty?
+    api_key = global_options[:api_key]
     search_term = args.shift
-    Veye::Package::Search.search(search_term, options)
+    Veye::Package::Search.search(api_key, search_term, options)
   end
 end
 
@@ -107,8 +108,9 @@ command :info do |c|
   c.action do |global_options, options, args|
     error_msg = Rainbow("package_key is missing").red
     help_now!(error_msg) if args.empty?
+    api_key = global_options[:api_key]
     package_key = args.shift
-    Veye::Package::Info.get_package(package_key, options)
+    Veye::Package::Info.get_package(api_key, package_key, options)
   end
 end
 
@@ -130,7 +132,9 @@ command :references do |c|
     error_msg = Rainbow("package_key is missing").red
     help_now!(error_msg) if args.empty?
     package_key = args.shift
-    Veye::Package::References.get_references(package_key, options)
+
+    api_key = global_options[:api_key]
+    Veye::Package::References.get_references(api_key, package_key, options)
   end
 end
 
@@ -143,10 +147,17 @@ command :check do |c|
   c.flag [:format, 'format-name'], :default_value => 'pretty'
 
   c.action do |global_options, options, args|
-    help_now!("Project file is missing.".color(:red)) if args.empty?
-    file_name = args.shift
+    file_path = args.shift
+    file_path ||= Dir.pwd
+
     api_key = global_options[:api_key]
-    Veye::Project::Check.upload(file_name, api_key, options)
+    files = Veye::Project.get_files(file_path)
+
+    if files.empty?
+      printf "Found no project files in: ".color(:red) + file_path + "\n"
+    else
+      Veye::Project::Check.check(file_path, files, api_key, options)
+    end
   end
 end
 
@@ -176,7 +187,7 @@ command :projects do |c|
       proj_key = args.shift
       api_key = global_options[:api_key]
 
-      Veye::Project::Check.get_project(proj_key, api_key, options)
+      Veye::Project::Check.get_project(api_key, proj_key, options)
     end
   end
 
@@ -187,7 +198,7 @@ command :projects do |c|
       help_now!("The filepath is missing.".color(:red)) if args.empty?
       filename = args.shift
       api_key = global_options[:api_key]
-      Veye::Project::Check.upload(filename, api_key, options)
+      Veye::Project::Check.upload(api_key, filename, options)
    end
   end
 
@@ -200,7 +211,7 @@ command :projects do |c|
 
       project_key, filename = args
       api_key = global_options[:api_key]
-      Veye::Project::Check.update(project_key, filename, api_key, options)
+      Veye::Project::Check.update(api_key, project_key, filename, options)
     end
   end
 
@@ -211,7 +222,7 @@ command :projects do |c|
       help_now!("Project's key is unspecified".color(:red)) if args.empty?
       proj_key = args.shift
       api_key = global_options[:api_key]
-      Veye::Project::License.get_licenses(proj_key, api_key, options)
+      Veye::Project::License.get_licenses(api_key, proj_key, options)
     end
   end
 
@@ -222,7 +233,7 @@ command :projects do |c|
       help_now!("Project is missing".color(:red)) if args.empty?
       proj_key = args.shift
       api_key = global_options[:api_key]
-      Veye::Project::Check.delete_project(proj_key, api_key)
+      Veye::Project::Check.delete_project(api_key, proj_key)
     end
   end
 end
@@ -239,7 +250,7 @@ command :products do |c|
       help_now!("Product's key is missing".color(:red)) if args.empty?
       prod_key = args.shift
       api_key = global_options[:api_key]
-      Veye::Package::Follow.get_follow_status(prod_key, api_key)
+      Veye::Package::Follow.get_follow_status(api_key, prod_key)
     end
   end
 
@@ -250,7 +261,7 @@ command :products do |c|
       help_now!("Product's key is missing".color(:red)) if args.empty?
       prod_key = args.shift
       api_key = global_options[:api_key]
-      Veye::Package::Follow.follow(prod_key, api_key)
+      Veye::Package::Follow.follow(api_key, prod_key)
     end
   end
 
@@ -261,7 +272,7 @@ command :products do |c|
       help_now!("Product's key is missing".color(:red)) if args.empty?
       prod_key = args.shift
       api_key = global_options[:api_key]
-      Veye::Package::Follow.unfollow(prod_key, api_key)
+      Veye::Package::Follow.unfollow(api_key, prod_key)
     end
   end
 end

data/changelogs.md

@@ -1,5 +1,18 @@
 # Changelogs
 
+## 0.2
+
+* fixed dependency sorting - it show outdated dependencies first;
+* fixed projects which used old API project_key;
+* fixed parameter inconsistencies for `check`, `licenses` commands;
+* updated dependencies;
+* add api_keys for packages api;
+* breaking changes in `check` command - it tracks all supported project files in the folder
+* add `veye.json` file to keep and manage a project specific configurations
+* fixed licenses field in project output
+* add Settings class to manage `veye.json` file
+
+
 ## 0.1
 
 * first stable release - no new functionalities

data/lib/veye/api/package.rb

@@ -17,79 +17,81 @@ module Veye
       end
 
       # returns package information
-      def self.get_package(prod_key, language)
+      def self.get_package(api_key, prod_key, language)
         lang = encode_language(language)
         safe_prod_key = encode_prod_key(prod_key)
+        qparams = {}
+        qparams[:api_key] = api_key if api_key.to_s.size > 0
         product_api = Resource.new "#{RESOURCE_PATH}/#{lang}/#{safe_prod_key}"
-        product_api.resource.get do |response, request, result|
+        product_api.resource.get({params: qparams}) do |response, request, result|
           JSONResponse.new(request, result, response)
         end
       end
 
-      def self.search(search_term, language = nil, group_id = nil, page = '1')
+      def self.search(api_key, search_term, language = nil, group_id = nil, page = '1')
         search_api = Resource.new "#{RESOURCE_PATH}/search/#{search_term}"
 
-        search_params = { q: search_term.to_s }
-        search_params[:lang] = encode_language(language) unless language.nil?
-        search_params[:g] = group_id unless group_id.nil?
+        qparams = { q: search_term.to_s }
+        qparams[:lang] = encode_language(language) unless language.nil?
+        qparams[:g] = group_id unless group_id.nil?
         if page.nil?
-          search_params[:page] = '1'
+          qparams[:page] = '1'
         else
-          search_params[:page] = page.to_s
+          qparams[:page] = page.to_s
         end
 
-        request_params = { params: search_params }
-        search_api.resource.get(request_params) do |response, request, result|
+        qparams[:api_key] = api_key if api_key.to_s.size > 0
+        search_api.resource.get({params: qparams}) do |response, request, result|
           JSONResponse.new(request, result, response)
         end
       end
 
       def self.get_follow_status(api_key, prod_key, language)
         product_api = Resource.new(RESOURCE_PATH)
-        qparams = { params: { api_key: api_key } }
+        qparams = {api_key: api_key}
         lang = encode_language(language)
         safe_prod_key = encode_prod_key(prod_key)
-
         path = "#{lang}/#{safe_prod_key}/follow.json"
-        product_api.resource[path].get(qparams) do |response, request, result|
+        product_api.resource[path].get({params: qparams}) do |response, request, result|
           Veye::API::JSONResponse.new(request, result, response)
         end
       end
 
       def self.follow(api_key, prod_key, language)
         api = Resource.new(RESOURCE_PATH)
-        qparams = { api_key: api_key }
         lang = encode_language(language)
         safe_prod_key = encode_prod_key(prod_key)
 
-        path = "/#{lang}/#{safe_prod_key}/follow.json"
-        api.resource[path].post(qparams) do |response, request, result|
+        path = "/#{lang}/#{safe_prod_key}/follow.json?api_key=#{api_key}"
+        api.resource[path].post({}) do |response, request, result|
           JSONResponse.new(request, result, response)
         end
       end
 
       def self.unfollow(api_key, prod_key, language)
         api = Resource.new(RESOURCE_PATH)
-        qparams = { params: { api_key: api_key } }
+        qparams = {api_key: api_key}
         lang = encode_language(language)
         safe_prod_key = encode_prod_key(prod_key)
 
         path = "/#{lang}/#{safe_prod_key}/follow.json"
-        api.resource[path].delete(qparams) do |response, request, result|
+        api.resource[path].delete({params: qparams}) do |response, request, result|
           JSONResponse.new(request, result, response)
         end
       end
 
-      def self.get_references(prod_key, language, page = nil)
+      def self.get_references(api_key, prod_key, language, page = nil)
         api = Resource.new(RESOURCE_PATH)
         lang = encode_language(language).capitalize # endpoint bug
         safe_prod_key = encode_prod_key(prod_key)
-
+  
         api_path = "/#{lang}/#{safe_prod_key}/references"
         page_nr = page.to_s unless page.nil?
         page_nr ||= 1
-        qparams = { params: { page: page_nr } }
-        api.resource[api_path].get(qparams) do |response, request, result|
+        
+        qparams = {page: page_nr}
+        qparams[:api_key] = api_key if api_key.to_s.size > 0 
+        api.resource[api_path].get({params: qparams}) do |response, request, result|
           JSONResponse.new(request, result, response)
         end
       end

data/lib/veye/api/project.rb

@@ -8,7 +8,7 @@ module Veye
       def self.check_file(filename)
         file_path = File.absolute_path(filename)
 
-        unless File.exists?(file_path)
+        unless File.exist?(file_path)
           printf("%s: Cant read file `%s`",
                  "Error".color(:red),
                  "#{filename}".color(:yellow))

data/lib/veye/base_executor.rb

@@ -1,11 +1,12 @@
+require_relative 'helpers/format_helpers'
+
 # Base class that will bring many helpers into command classes.
 class BaseExecutor
   extend FormatHelpers
 
   def self.show_results(output_formats, results, options = {}, paging = nil)
-    format = options[:format] || 'pretty'
-    self.supported_format?(output_formats, format)
-    formatter = output_formats[format]
+    formatter = get_formatter(output_formats, options)
+    return if formatter.nil?
 
     formatter.before
     formatter.format(results)
@@ -14,7 +15,7 @@ class BaseExecutor
 
   def self.valid_response?(response, msg)
     if response.nil? || response.success != true
-      p "#{msg.to_s.color(:red)}: #{response.data}\n"
+      printf "#{msg.to_s.color(:red)}: #{response.data}\n"
       return false
     end
 
@@ -25,4 +26,55 @@ class BaseExecutor
   def self.catch_request_error(response, msg)
     valid_response?(response, msg)
   end
+
+  def self.filter_dependencies(results, options)
+
+    if options[:all]
+      results['dependencies'].to_a.sort_by {|x| x['outdated'] ? -1 : 0}
+    else
+      results['dependencies'].to_a.keep_if {|x| x['outdated']}
+    end
+  end
+  
+  def self.show_dependencies(output_formats, results, options)
+    formatter = get_formatter(output_formats, options)
+    return if formatter.nil?
+
+    deps = filter_dependencies(results, options)     
+
+    formatter.before
+    formatter.format deps
+    formatter.after
+  end
+
+  def self.show_bulk_dependencies(output_formats, results, options)
+    formatter = get_formatter(output_formats, options)
+    return if formatter.nil?
+
+    formatter.before
+    results.each do |filename, deps|
+      formatter.format filter_dependencies(deps, options), filename
+    end
+
+    formatter.after
+  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
+  end
+
+  def self.get_formatter(output_formats, options)
+    format = options[:format]
+    format ||= 'pretty'
+    #return if format == 'json' #dependecy json format is handled by results formatter
+    output_formats[format] if supported_format?(output_formats, format)
+  end
+
+
 end

data/lib/veye/helpers/format_helpers.rb

@@ -9,7 +9,7 @@ module FormatHelpers
 
   def formats_attached?(output_formats)
     if output_formats.nil?
-      p 'Executor doesnt have any formattor defined.'.color(:red)
+      printf 'Executor doesnt have any formattor defined.\n'.color(:red)
     end
     !output_formats.nil?
   end
@@ -18,7 +18,7 @@ module FormatHelpers
     unless output_formats.key?(format)
       msg = "Unsupported output format: `#{format}`\n".color(:red)
       msg += "Supported formats: #{output_formats.keys.join(', ')}\n"
-      p msg
+      printf msg
       return false
     end
     true

data/lib/veye/package/follow.rb

@@ -14,7 +14,7 @@ module Veye
         )
       end
 
-      def self.get_follow_status(package_key, api_key)
+      def self.get_follow_status(api_key, package_key)
         prod_key, lang = Package.parse_key(package_key)
         results = Veye::API::Package.get_follow_status(api_key, prod_key, lang)
         if valid_response?(results, 'Didnt get any response.')
@@ -22,7 +22,7 @@ module Veye
         end
       end
 
-      def self.follow(package_key, api_key)
+      def self.follow(api_key, package_key)
         prod_key, lang = Package.parse_key(package_key)
         results = Veye::API::Package.follow(api_key, prod_key, lang)
         if valid_response?(results, 'Cant follow.')
@@ -30,7 +30,7 @@ module Veye
         end
       end
 
-      def self.unfollow(package_key, api_key)
+      def self.unfollow(api_key, package_key)
         prod_key, lang = Package.parse_key(package_key)
         results = Veye::API::Package.unfollow(api_key, prod_key, lang)
         if valid_response?(results, 'Cant unfollow.')

data/lib/veye/package/info.rb

@@ -12,9 +12,9 @@ module Veye
         'table'     => Package::InfoTable.new
       }
 
-      def self.get_package(package_key, options = {})
+      def self.get_package(api_key, package_key, options = {})
         prod_key, lang = Package.parse_key(package_key)
-        results = Veye::API::Package.get_package(prod_key, lang)
+        results = Veye::API::Package.get_package(api_key, prod_key, lang)
         err_msg = "Didnt find any package with product_key: `#{package_key}`"
         if valid_response?(results, err_msg)
           paging = results.data['paging']

data/lib/veye/package/references.rb

@@ -12,10 +12,10 @@ module Veye
         'table'     => Package::ReferencesTable.new
       }
 
-      def self.get_references(package_key, options = {})
+      def self.get_references(api_key, package_key, options = {})
         prod_key, lang = Package.parse_key(package_key)
         results = Veye::API::Package.get_references(
-          prod_key, lang, options[:page]
+          api_key, prod_key, lang, options[:page]
         )
         if valid_response?(results, "No references for: `#{package_key}`")
           paging = results.data['paging']

data/lib/veye/package/search.rb

@@ -13,9 +13,10 @@ module Veye
         'table'     => Package::SearchTable.new
       }
 
-      def self.search(search_term, options)
+      def self.search(api_key, search_term, options)
         results = Veye::API::Package.search(
-          search_term, options[:language], options['group-id'], options[:page]
+          api_key, search_term, options[:language],
+          options['group-id'], options[:page]
         )
         if valid_response?(results, "No results for `#{search_term}`")
           show_results(@output_formats,

data/lib/veye/pagination/pagination_pretty.rb

@@ -9,7 +9,7 @@ module Veye
 
       def format(paging)
         printf("\t%15s - %s\n",
-               "Current page".color(:green).bright,
+               "Current page".color(:green),
                "#{paging['current_page']}".bright)
         puts "\t-------------------------"
         printf("\t%-15s: %s\n", "Per page", paging['per_page'])