agile-cli 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8343b20f864b9087c903e2bdf4a0c7dbc879dbd0675e98918c235d4fa88b18ef
-  data.tar.gz: 07bdd7283c5ec3f56f6b6556da4aa27df85a88cf08dd69e907ab0103ce32eb80
+  metadata.gz: e4a0fc2a675123cfb741925947c8bfb324d8df7cb82c561c3d9c671a4c84c3ef
+  data.tar.gz: cfa82e1635468ef2f176fae5185a582799f460930992d28ef2a3b3b1840ba84c
 SHA512:
-  metadata.gz: 5714b3d98508a8a58c8c255d3e0e7ece917eb2f1b793c458dd864b92ee1ba01c46d9181d3a2b94888ab2c083beeaf7dd16af81d16370af0b21f7e7cee4009abb
-  data.tar.gz: 5d94825a5ce075551dbdd5691813ffd15549cc17a45d0440a1216e483ca4506805f8147ca2f27397cbb32df8dd7662261dc844208614bb97032adbc1c3b26155
+  metadata.gz: 936274daaa02999b806b3cb925aa0b120e81dfbab226e05126db3bb9ef5674d4d9734e30625475733bad637ecd663b767c872108bb3e5c70bcddc8ed55b02d0c
+  data.tar.gz: 6a34fe8113bda4a70ecfb223a55a9b0783baa542390991499f3ca637e9e8e7993a934c0982df1fd54365f47a1f057c47173152a697d5f3a3926ec090e3aa873a

data/.gitignore

@@ -6,6 +6,8 @@
 /pkg/
 /spec/reports/
 /tmp/
-
+lib/.config.json
+Gemfile.lock
+.idea/
 # rspec failure tracking
 .rspec_status

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    agile-cli (0.0.10)
+    agile-cli (0.0.11)
+      highline (~> 2.0.2)
       rainbow (~> 3.0.0)
       rest-client (~> 2.0.2)
       terminal-table (~> 1.8.0)
@@ -35,6 +36,7 @@ GEM
     equalizer (0.0.11)
     factory_bot (5.0.2)
       activesupport (>= 4.2.0)
+    highline (2.0.2)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
     i18n (1.6.0)

data/agile-cli.gemspec

@@ -13,6 +13,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.executables   = ["agile"]
 
+  spec.add_dependency "highline", "~> 2.0.2"
   spec.add_dependency "rainbow", "~> 3.0.0"
   spec.add_dependency "rest-client", "~> 2.0.2"
   spec.add_dependency "terminal-table", "~> 1.8.0"

data/lib/agile/commands/init.rb

@@ -5,16 +5,25 @@ module Agile
     desc Rainbow("init REMOTE_URL").cornflower, Rainbow("Add default remote").darkgoldenrod
 
     def init(remote)
-      create_config_file
-      CONFIG["current_remote"] = remote
-      File.write("#{GEM_PATH}.config.json", JSON.generate(CONFIG))
-      say "Successfully added new remote!"
+      error_checking
+      if remote =~ URL_PATTERN || remote =~ LOCALHOST_PATTERN
+        write_remote_to_config(remote)
+        say "Successfully added new remote!"
+      else
+        say "It's not a url!"
+      end
     end
 
     private
-    
-    def create_config_file
-      `touch #{GEM_PATH}.config.json` if `find "#{GEM_PATH}" -name .config.json`.empty?
+
+    def error_checking
+      abort "You've already did init! Try to add more remotes" if CONFIG["current_remote"]
+    end
+
+    def write_remote_to_config(remote)
+      CONFIG["current_remote"] = remote
+      CONFIG["remotes"] = [remote]
+      File.write("#{GEM_PATH}.config.json", JSON.generate(CONFIG))
     end
   end
 end

data/lib/agile/commands/login.rb

@@ -1,30 +1,31 @@
 # :reek:InstanceVariableAssumption
 module Agile
   class CLI < Thor
-    desc Rainbow("login LOGIN_FROM_GITHUB").cornflower, Rainbow("Sign in github.").darkgoldenrod
-    def login(username)
+    desc Rainbow("login").cornflower, Rainbow("Sign in github.").darkgoldenrod
+    def login
       if CONFIG
-        write_to_config(username)
-        authorize
+        `open "#{GITHUB_URL}/oauth/authorize?client_id=#{CLIENT_ID}"`
+        secret_node = call_cli
+        response = RestClient.get "#{CONFIG['current_remote']}/api/v1/users/#{secret_node}"
+        login = JSON.parse(response).map { |hash| hash[1]["attributes"]["github_login"] }
+        write_to_config(secret_node, login)
+        say "Hello, #{login[0]}!"
       else
-        say "You need to add a remote!"
+        say "You need to init!"
       end
     end
 
     private
 
-    def github_user_login(username)
-      @curr_user = JSON.parse(`curl -s -u "#{username}" "#{GITHUB_URL}"`)["login"]
-    end
-
-    def authorize
-      RestClient.get "#{CONFIG['current_remote']}/api/v1/users/#{@curr_user}"
-      say "Hello, #{@curr_user}" if @curr_user
+    def write_to_config(secret_node, login)
+      CONFIG["current_user"] = login[0]
+      CONFIG["user_node"] = secret_node
+      File.write("#{GEM_PATH}.config.json", JSON.generate(CONFIG))
     end
 
-    def write_to_config(username)
-      CONFIG["current_user"] = github_user_login(username)
-      File.write("#{GEM_PATH}.config.json", JSON.generate(CONFIG))
+    def call_cli
+      cli = HighLine.new
+      cli.ask("Enter your secret code:  ")
     end
   end
-end
+end

data/lib/agile/commands/projects.rb

@@ -2,10 +2,11 @@
 module Agile
   class Projects < Thor
     desc "create <project>", "Create new project"
-    def create(project_name)  
+    def create(project_name)
+      error_checking
       response = RestClient.post "#{CONFIG['current_remote']}/api/v1/projects/", { name: project_name }
       if response.body
-        say "Successelly create project #{project_name}"
+        say "Successfully created project #{project_name}"
       else
         say "Try again"
       end
@@ -13,29 +14,25 @@ module Agile
 
     desc "list", "Show projects"
     def list
+      error_checking
       response = RestClient.get "#{CONFIG['current_remote']}/api/v1/projects/"
-      data = JSON.parse(response)
-      array = data.map { |hash| hash.values }
-      info = array.map { |hash| hash[1]}
       say Rainbow("<<Your Projects>>").cornflower
-      info.map { |name| p name }
+      JSON.parse(response).map { |hash| p hash.values[1] }
     end
 
     desc "use <project>", "Select current project"
     def use(project)
-      if CONFIG
-        response = RestClient.get "#{CONFIG['current_remote']}/api/v1/projects/"
-      else
-        say "You need to add a remote!"
-      end
+      error_checking
+      response = RestClient.get "#{CONFIG['current_remote']}/api/v1/projects/"
       project_search(response, project)
     end
 
     desc "delete <project>", "Delete project"
     def delete(project)
-      response = RestClient.delete "#{CONFIG['current_remote']}/api/v1/projects/#{project}", { name: project}
+      error_checking
+      response = RestClient.delete "#{CONFIG['current_remote']}/api/v1/projects/#{project}", name: project
       if response.body
-        say "Successelly delete project #{project}"
+        say "Successfully deleted project #{project}"
       else
         say "Try again"
       end
@@ -43,26 +40,30 @@ module Agile
 
     desc "update <project_name> <new_project_name>", "Update project name"
     def update(project, new_project)
+      error_checking
       response = RestClient.put "#{CONFIG['current_remote']}/api/v1/projects/#{project}", name: project, new_name: new_project
       if response.body
-        say "Successelly update project #{project}"
+        say "Successfully updated project #{project}"
       else
         say "Try again"
       end
     end
-  
+
     private
 
+    def error_checking
+      abort "You haven't done init yet!" unless CONFIG["current_remote"]
+      abort "Please, log in!" unless CONFIG["current_user"]
+    end
+
     def project_search(response, project)
-      array = JSON.parse(response)
-      info = array.map { |hash| hash.values }
-      names = info.map{ |hash| hash[1] }
-      if names.include?(project)
+      info = JSON.parse(response).map { |hash| hash.values[1] }
+      if info.include?(project)
         CONFIG["current_project"] = project
         File.write("#{GEM_PATH}.config.json", JSON.generate(CONFIG))
         say "Your project: #{project}"
       else
-        say "Such a project does not exist. Try again"
+        say "Such project does not exist. Try again"
       end
     end
   end

data/lib/agile/commands/remotes.rb

@@ -0,0 +1,52 @@
+module Agile
+  class Remotes < Thor
+    desc "use <remotes url>", "Use remote"
+    def use(remote)
+      error_checking
+      if CONFIG["remotes"].include?(remote)
+        CONFIG["current_remote"] = remote
+        File.write("#{GEM_PATH}.config.json", JSON.generate(CONFIG))
+        say "Successfully change remote!"
+      else
+        say "Try again"
+      end
+    end
+
+    desc "add <remotes url>", "Add remote url"
+    def add(remote)
+      error_checking
+      if remote =~ URL_PATTERN || remote =~ LOCALHOST_PATTERN
+        CONFIG["remotes"].push(remote)
+        File.write("#{GEM_PATH}.config.json", JSON.generate(CONFIG))
+        say "Successfully added new remote!"
+      else
+        say "It's not a url!"
+      end
+    end
+
+    desc "list", "Remotes list"
+    def list
+      error_checking
+      CONFIG["remotes"].each do |name|
+        if name == CONFIG["current_remote"]
+          p "* #{name}"
+        else
+          p name
+        end
+      end
+    end
+
+    private
+
+    def error_checking
+      abort "You haven't done init yet!" unless CONFIG["current_remote"]
+      abort "Please, log in!" unless CONFIG["current_user"]
+      abort "You have no remotes. Try to init!" unless CONFIG["remotes"]
+    end
+  end
+
+  class CLI < Thor
+    desc Rainbow("remotes SUBCOMMAND ...ARGS").cornflower, Rainbow("Command for work with remotes").darkgoldenrod
+    subcommand "remotes", Remotes
+  end
+end

data/lib/agile/constants.rb

@@ -1,7 +1,12 @@
-# frozen_string_literal: true
+# rubocop:disable Style/RegexpLiteral
 
 module Agile
-  VERSION = "0.0.11"
-  GITHUB_URL = %(https://api.github.com/user)
+  VERSION = "0.0.12"
+  GITHUB_URL = %(https://github.com/login)
   TERMINAL_STYLE = { border_x: "=", border_i: "x", padding_left: 3 }.freeze
+  CLIENT_ID = "8bf42da7e4f9032ac5d8"
+  CLIENT_SECRET = "cfef987b3839a1a846ba3f0707aa036240d2d625"
+  URL_PATTERN = /[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(([0-9]{1,5})?\/.*)?$}/
+  LOCALHOST_PATTERN = /localhost:/
 end
+# rubocop:enable Style/RegexpLiteral

data/lib/agile.rb

@@ -4,10 +4,16 @@ require "agile/constants"
 require "json"
 require "rest-client"
 require "terminal-table"
+require "highline"
 Dir[File.join(__dir__, "agile/commands", "*.rb")].each { |file| require file }
 
 module Agile
   GEM_PATH = `gem which agile`.chomp.chomp("agile.rb")
+  if `find "#{GEM_PATH}" -name .config.json`.empty?
+    `touch #{GEM_PATH}.config.json`
+    File.write("#{GEM_PATH}.config.json", {})
+  end
+
   CONFIG = JSON.parse(File.read("#{GEM_PATH}.config.json"))
 
   class CLI < Thor

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: agile-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - rubizza-camp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-17 00:00:00.000000000 Z
+date: 2019-08-23 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
@@ -213,7 +227,6 @@ files:
 - agile-cli.gemspec
 - bin/agile
 - bin/setup
-- lib/.config.json
 - lib/agile.rb
 - lib/agile/assets/agile_principles.txt
 - lib/agile/assets/agile_values.txt
@@ -229,6 +242,7 @@ files:
 - lib/agile/commands/manifesto.rb
 - lib/agile/commands/principles.rb
 - lib/agile/commands/projects.rb
+- lib/agile/commands/remotes.rb
 - lib/agile/commands/values.rb
 - lib/agile/commands/version.rb
 - lib/agile/constants.rb

data/lib/.config.json

@@ -1 +0,0 @@
-{"current_remote":"localhost:3000","current_user":"nieisnuje","current_project":"AgileCli"}