veye 0.0.9 → 0.1

data/lib/veye/service.rb

@@ -1,26 +1,22 @@
 module Veye
+  # CLI wrappers for API
   class Service
-    RESOURCE_PATH = "/services"
-    def self.ping(n = 1)
-      public_api = API::Resource.new RESOURCE_PATH
-      api_response =  "no idea"
-      public_api.resource['/ping'].get do |response, request, result, &block|
-        api_response = API::JSONResponse.new(request, result, response)
-      end
-      show_result(api_response)
-      return api_response
+    def self.ping
+      show_result(Veye::API::Service.ping)
     end
 
     def self.show_result(result)
-      if result.success
+      if result.nil?
+        puts 'Request failure'.color(:red)
+      elsif result.success
         puts "#{result.data['message']}".color(:green)
-     else
-       printf(
-         "VersionEye didnt recognized secret word.Answered %s, %s\n",
-         result.code.to_s.color(:red),
-         "#{result.message}".color(:yellow)
-       )
-     end
+      else
+        printf(
+          "VersionEye didnt recognized secret word.Answered %s, %s\n",
+          result.code.to_s.color(:red),
+          result.message.to_s.color(:yellow)
+        )
+      end
     end
   end
 end

data/lib/veye/user/me.rb

@@ -1,19 +1,19 @@
 require_relative '../views/user.rb'
 require_relative '../base_executor.rb'
 
-
 module Veye
   module User
+    # Me class includes commands to manage and view authorized user profile
+    # and favorites.
     class Me < BaseExecutor
-
-      @@profile_formats = {
+      @profile_formats = {
         'csv'     => User::ProfileCSV.new,
         'json'    => User::ProfileJSON.new,
         'pretty'  => User::ProfilePretty.new,
         'table'   => User::ProfileTable.new
       }
 
-      @@favorite_formats = {
+      @favorite_formats = {
         'csv'     => User::FavoriteCSV.new,
         'json'    => User::FavoriteJSON.new,
         'pretty'  => User::FavoritePretty.new,
@@ -21,39 +21,20 @@ module Veye
       }
 
       def self.get_profile(api_key, options)
-        user_api = API::Resource.new(RESOURCE_PATH)
-        results = nil
-        qparams = {:params => {:api_key => api_key}}
-
-        user_api.resource.get(qparams) do |response, request, result|
-          results = API::JSONResponse.new(request, result, response)
+        results = Veye::API::User.get_profile(api_key)
+        if valid_response?(results, 'Failed to read profile.')
+          show_results(@profile_formats, results.data, options)
         end
-
-        catch_request_error(results, "Failed to read profile.")
-        show_results(@@profile_formats, results.data, options)
-        results
       end
 
       def self.get_favorites(api_key, options)
-        user_api = API::Resource.new(RESOURCE_PATH)
-        results = nil
-        page = options[:page] || 1
-        qparams = {
-          :params => {
-            :api_key => api_key,
-            :page => page
-          }
-        }
+        results = Veye::API::User.get_favorites(api_key, options[:page])
 
-        user_api.resource['/favorites'].get(qparams) do |response, request, result|
-          results = API::JSONResponse.new(request, result, response)
+        if valid_response?(results, 'Failed to read favorites.')
+          paging = results.data['paging']
+          show_results(@favorite_formats, results.data, options, paging)
         end
-
-        catch_request_error(results, "Failed to read favorites.")
-        show_results(@@favorite_formats, results.data, options, results.data['paging'])
-        results
       end
     end
   end
 end
-

data/lib/veye/user.rb

@@ -1,7 +1,8 @@
 require_relative 'user/me.rb'
 
 module Veye
+  # User namespace includes user related commands
+  # and classes required to render results on commandline.
   module User
-    RESOURCE_PATH = "/me"
   end
 end

data/lib/veye/version.rb

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

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

@@ -4,7 +4,7 @@ module Veye
   module Github
     class InfoCSV < BaseCSV
       def initialize
-        headers = "name,language,owner_login,owner_type,private,fork,branches,imported_projects, description"
+        headers = "name,language,owner_login,owner_type,private,fork,branches,imported_projects,description"
         super(headers)
       end
       def format(results)
@@ -20,8 +20,8 @@ module Veye
           repo['owner_type'],
           repo['private'],
           repo['fork'],
-          repo['branches'].join('|'),
-          imported_project_names.join('|'),
+          repo['branches'].to_a.join('|'),
+          imported_project_names.to_a.join('|'),
           repo['description']
         )
       end

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

@@ -5,6 +5,10 @@ module Veye
     class InfoJSON < BaseJSON
       def format(results)
         @results[:repo] = results['repo']
+
+        if results.has_key?('imported_projects')
+          @results[:projects] = results['imported_projects']
+        end
       end
     end
   end

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

@@ -4,13 +4,14 @@ module Veye
   module Github
     class ListCSV < BaseCSV
       def initialize
-        headers = "nr,fullname,language,owner_login,owner_type,private,fork,branches,description"
+        headers = "nr,fullname,language,owner_login,owner_type,private,fork,\
+branches,imported,description"
         super(headers)
       end
 
       def format(results)
         results['repos'].each_with_index do |result, index|
-          printf("%d,%s,%s,%s,%s,%s,%s,%s,%s\n",
+          printf("%d,%s,%s,%s,%s,%s,%s,%s,%s,%s\n",
                 index + 1,
                 result['fullname'],
                 result['language'],
@@ -18,7 +19,8 @@ module Veye
                 result['owner_type'],
                 result['private'],
                 result['fork'],
-                result['branches'].join('|'),
+                result['branches'].to_a.join('|'),
+                result['imported'].to_a.join('|'),
                 result['description']
                 )
         end

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

@@ -18,9 +18,9 @@ module Veye
         printf("\t%-15s: %s\n", "Owner type", result['owner_type'])
         printf("\t%-15s: %s\n", "Private",    result['private'])
         printf("\t%-15s: %s\n", "Fork",       result['fork'])
-        printf("\t%-15s: %s\n", "Branches",   result['branches'].join(','))
+        printf("\t%-15s: %s\n", "Branches",   result['branches'].to_a.join(','))
         printf("\t%-15s: %s\n", "Description", result['description'])
-        printf("\t%-15s: %s\n", "Imported", result['imported_projects'].join(','))
+        printf("\t%-15s: %s\n", "Imported", result['imported_projects'].to_a.join(','))
       end
     end
   end

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

@@ -4,7 +4,8 @@ module Veye
   module Github
     class ListTable < BaseTable
       def initialize
-        headings = %w(index fullname language owner_login owner_type private fork branches imported)
+        headings = %w(index fullname language owner_login owner_type private
+                      fork branches imported)
         super("Github repositories", headings)
       end
 
@@ -17,7 +18,7 @@ module Veye
           row << result['owner_type']
           row << result['private']
           row << result['fork']
-          row << result['branches'].join("\n")
+          row << result['branches'].to_a.join("\n")
           row << result['imported_projects'].to_a.join("\n")
           #row << result['description']
           @table << row

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

@@ -16,7 +16,7 @@ module Veye
                                 "#{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["link"])
+        printf("\t%-15s: %s\n", "Link", result["links"].first.fetch('link'))
 
       end
     end

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

@@ -4,7 +4,7 @@ module Veye
   module Package
     class SearchCSV < BaseCSV
       def initialize
-        headers = "nr,name,version,prod_key,version,language,group_id"
+        headers = "nr,name,version,prod_key,language,group_id"
         super(headers)
       end
 
@@ -13,12 +13,11 @@ module Veye
         return if items.nil?
 
         items.each_with_index do |result, index|
-          printf("%d,%s,%s,%s,%s,%s,%s\n",
+          printf("%d,%s,%s,%s,%s,%s\n",
                   index + 1,
                   result["name"],
                   result["version"],
                   result["prod_key"],
-                  result["version"],
                   result["language"],
                   result["group_id"])
         end

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

@@ -4,7 +4,7 @@ module Veye
   module Package
     class SearchTable < BaseTable
       def initialize
-        headings = %w(index name version product_key language group_id)
+        headings = %w(index name version product_key language)
         super("Package search", headings)
       end
 
@@ -14,8 +14,6 @@ module Veye
         items.each_with_index do |result, index|
           row = [index+1, result["name"], result["version"], result["prod_key"]]
           row << result["language"]
-          row << result["group_id"]
-
           @table << row
         end
       end

data/lib/veye/views/package.rb

@@ -15,6 +15,6 @@ require_relative 'package/references_table.rb'
 
 
 module Veye
-  module Github
+  module Package
   end
 end

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

@@ -4,15 +4,15 @@ module Veye
   module Project
     class LicenceCSV < BaseCSV
       def initialize
-        headers = "nr,licence,product_keys"
+        headers = "nr,license,product_keys"
         super(headers)
       end
       def format(results)
         return nil if results.nil?
         n = 1
-        results["licenses"].each_pair do |licence, prods|
+        results["licenses"].each_pair do |license, prods|
           prod_keys = prods.map {|p| p["prod_key"]}
-          printf("%d,%s,%s\n", n, licence, prod_keys.join(','))
+          printf("%d,%s,%s\n", n, license, prod_keys.join(','))
           n += 1
         end
       end

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

@@ -4,7 +4,7 @@ module Veye
   module Project
     class LicenceJSON < BaseJSON
       def format(results)
-        @results[:licences] = results["licenses"]
+        @results[:licenses] = results["licenses"]
       end
     end
   end

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

@@ -5,7 +5,7 @@ module Veye
   module Project
     class LicencePretty < BasePretty
       def format(results)
-        return if result.nil?
+        return if results.nil?
         n = 1
         results["licenses"].each_pair do |licence, products|
           product_keys = products.map {|prod| prod["prod_key"]}

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

@@ -4,16 +4,16 @@ module Veye
   module Project
     class LicenceTable < BaseTable
       def initialize
-        headings = %w(index licence product_keys)
+        headings = %w(index license product_keys)
         super("Licences", headings)
       end
       def format(results)
         items = results['licenses']
         return if items.nil?
         n = 1
-        items.each_pair do |licence, products|
+        items.each_pair do |license, products|
           products.each do |prod|
-            row = [n, licence, prod["prod_key"]]
+            row = [n, license, prod["prod_key"]]
             @table << row
           end
           n += 1

data/lib/veye/views/user/profile_table.rb

@@ -4,7 +4,10 @@ module Veye
   module User
     class ProfileTable < BaseTable
       def initialize
-        headings = %w(username fullname email plan_name, admin, deleted, new_notifications, total_notifications)
+        headings = %w(
+          username fullname email plan_name admin deleted
+          new_notifications total_notifications
+        )
         super("User's profile", headings)
       end
 

data/lib/veye/views/user.rb

@@ -9,6 +9,8 @@ require_relative 'user/favorite_pretty.rb'
 require_relative 'user/favorite_table.rb'
 
 module Veye
+  # User namespace includes user related commands
+  # and classes required to render results on commandline.
   module User
   end
-end
+end

data/lib/veye.rb

@@ -1,9 +1,9 @@
 # Add requires for other files you add to your project here, so
 # you just need to require this one file in your bin file
-require 'openssl'
+require 'rest-client'
+require 'yaml'
 
 require 'veye/helpers/format_helpers.rb'
-require 'veye/helpers/repo_helpers.rb'
 
 require 'veye/version.rb'
 require 'veye/service.rb'
@@ -14,9 +14,9 @@ require 'veye/user.rb'
 require 'veye/github.rb'
 require 'veye/pagination.rb'
 
-$global_options ||= nil
-DEFAULT_CONFIG_FILE = ".veye.rc"
-DEFAULT_CONFIG_PATH = "~"
+$global_options ||= {}
+DEFAULT_CONFIG_FILE = '.veye.rc'
+DEFAULT_CONFIG_PATH = '~'
 
 def get_config_fullpath
   File.expand_path("#{DEFAULT_CONFIG_PATH}/#{DEFAULT_CONFIG_FILE}")
@@ -24,44 +24,43 @@ end
 
 def config_exists?
   filepath = get_config_fullpath
-  File.exists?(filepath)
+  File.exist?(filepath)
 end
 
 def check_config_file
   unless config_exists?
-    msg = sprintf("%s: %s\n",
-                  "config file doesnt exist. ".color(:red),
-                  "Use `veye initconfig` to initialize settings file.")
-    exit_now!(msg)
+    p format(
+      "%s: %s\n",
+      'config file doesnt exist.'.color(:red),
+      'Use `veye initconfig` to initialize settings file.'
+    )
+    exit
   end
 end
 
 def self.check_configs(global_opts, needs_api_key)
   check_config_file
   check_api_key(global_opts) if needs_api_key
-
-  unless ssl_key_exists?(global_opts)
-    generate_ssl_keys(global_opts)
-  end
   true
 end
 
 def init_environment
-    #sets up required variables and modules to work on IRB or unittest
-    config_file = get_config_fullpath
-    $global_options = YAML.load_file(config_file)
-    $global_options[:config_file] = config_file
-    $global_options[:url] = Veye::API::Resource.build_url($global_options)
-    $global_options
+  # sets up required variables and modules to work on IRB or unittest
+  config_file = get_config_fullpath
+  $global_options = YAML.load_file(config_file)
+  $global_options[:config_file] = config_file
+  $global_options[:url] = Veye::API::Resource.build_url($global_options)
+  $global_options
 end
 
 def check_api_key(global_opts)
   result = false
-  if global_opts[:api_key].nil? or global_opts[:api_key].match("add your api key")
-    msg = sprintf("%s: %s\n",
-                "Warning: API key is missing.".color(:yellow),
-                "You cant access private data.")
-     print msg
+  if global_opts[:api_key].nil? || global_opts[:api_key].match("add your api key")
+    print format(
+      "%s: %s\n",
+      'Warning: API key is missing.'.color(:yellow),
+      'You cant access private data.'
+    )
   else
     result = true
   end
@@ -69,45 +68,14 @@ def check_api_key(global_opts)
   result
 end
 
-def ssl_key_exists?(global_opts)
-  fullpath = File.expand_path(global_opts[:ssl_path])
-  return File.exists?("#{fullpath}/veye_cert.pem")
-end
-
-def generate_ssl_keys(global_opts)
-  result = false
-
-  Dir.chdir(Dir.home)
-  ssl_path = File.expand_path(global_opts[:ssl_path])
-  unless Dir.exists?(ssl_path)
-    print "Info: Creating folder for ssl keys: `#{ssl_path}`\n"
-    Dir.mkdir(ssl_path)
-  end
-
-  Dir.chdir(ssl_path)
-
-  key = OpenSSL::PKey::RSA.new 2048
-  open 'veye_key.pem', 'w' do |io| io.write(key.to_pem) end
-  open 'veye_cert.pem', 'w' do |io| io.write(key.public_key.to_pem) end
-
-  if ssl_key_exists?(global_opts)
-    print "Success: SSL keys are generated.\n"
-    result = true
-  else
-    print "Error: Cant generate SSL keys. Do you have openssl installed?\n"
-  end
-
-  Dir.chdir(Dir.home)
-  result
-end
-
 def save_configs
   filepath = get_config_fullpath
   File.open(filepath, 'w') do |f|
     f.puts $global_options.to_yaml
   end
-  msg = sprintf("%s: %s",
-         "Success".color(:green),
-         "new settings are saved into file: `#{filepath}`\n")
-  print msg
+  print format(
+    "%s: %s",
+    'Success'.color(:green),
+    "new settings are saved into file: `#{filepath}`"
+  )
 end

data/test/api/github_test.rb

@@ -0,0 +1,84 @@
+require 'test_helper'
+
+class GithubTest < Minitest::Test
+  def setup
+    init_environment
+    @api_key = 'ba7d93beb5de7820764e'
+    @repo_name = 'versioneye/veye'
+    @branch = "master"
+    @file = "Gemfile.lock"
+  end
+
+  def test_list_api
+    VCR.use_cassette('github_list') do
+      res = Veye::API::Github.get_list(@api_key)
+      refute_nil res
+      assert_equal 200, res.code
+      repo = res.data["repos"][0]
+      assert_equal "versioneye_update", repo["name"]
+      assert_equal "shell", repo["language"]
+      assert_equal "versioneye", repo["owner_login"]
+      assert_equal "organization", repo["owner_type"]
+      assert_equal false, repo["private"]
+    end
+  end
+
+  def test_sync_api
+    VCR.use_cassette('github_sync') do
+      resp = Veye::API::Github.import_all(@api_key)
+      refute_nil resp
+      assert_equal 200, resp.code
+      assert_equal( {"status"=>"running"}, resp.data )
+    end
+  end
+
+  def test_info_api
+    VCR.use_cassette('github_info') do
+      res = Veye::API::Github.get_repo(@api_key, @repo_name)
+      refute_nil res
+      assert_equal 200, res.code
+      repo = res.data["repo"]
+      assert_equal "versioneye/veye", repo["fullname"]
+      assert_equal "ruby", repo["language"]
+      assert_equal "versioneye", repo["owner_login"]
+      assert_equal false, repo["private"]
+      assert_equal false, repo["fork"]
+      assert_equal [], res.data["imported_projects"]
+    end
+  end
+
+  def test_import_api
+    VCR.use_cassette('github_import') do
+      res = Veye::API::Github.import_repo(@api_key, @repo_name, @branch, @file)
+      refute_nil res
+      assert_equal 201, res.code
+      repo = res.data["repo"]
+
+      assert_equal "veye", repo["name"]
+      assert_equal "versioneye/veye", repo["fullname"]
+      assert_equal "ruby", repo["language"]
+      assert_equal "versioneye", repo["owner_login"]
+      assert_equal "organization", repo["owner_type"]
+      assert_equal false, repo["private"]
+      assert_equal false, repo["fork"]
+
+      project = res.data["imported_projects"].first
+      refute_nil project, "imported_projects fields is missing"
+      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"]
+      assert_equal "github", project["source"]
+    end
+  end
+
+  def test_delete_api
+    VCR.use_cassette('github_delete') do
+      res = Veye::API::Github.delete_repo(@api_key, @repo_name, @branch)
+
+      refute_nil res, "No API response"
+      assert_equal 200, res.code
+      assert_equal true, res.data["success"]
+    end
+  end
+end