rondabot 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab845481999c484ecd45896fd99b6f296b58b09943684c78ec874c19e70006d4
-  data.tar.gz: 61a104ab19b98feb442cf07d54281456772f390bd6bc56da9292bf03357f2b23
+  metadata.gz: 950eb5a191650e0e0b1935b34bdf5eb251d908df604b8225f6c8c2cd06e264f7
+  data.tar.gz: 9f36e7afbc04fe8a3ecf64a4f4671b4fdb0eadceffb2848fed1c2a62b609cd3f
 SHA512:
-  metadata.gz: 9709cc0c08f032d92c356ecbca9f80473fe1128c96f4f2cddf04940242917270abcc3bd40d3b4a2379753849727f78d1f3d39efe0c90cfadfbf8db69c92eb32c
-  data.tar.gz: a718ccd264dfe96d4f2ab8608907198eb25807ac679a7792cf9d042a8d367a49f9d65e123de5aa7c44004f2f0f57d185b5cb64508601d7c9084952239c98d05e
+  metadata.gz: 0a32928624a26886eab26cb81c64ee2a7a29b759a486ff92047e424e36fc997d2355ddc38fc90a7ccdc74bdcd8e056c17fd51416a769e296d01b30e8a2358010
+  data.tar.gz: d0cfc6c44c3ec5b06880e65fda10a37389649239806a3ce03dd1dba5a0801e057fff9d97ff5d4d6b91d64237559eee041e0c5bb7a9a3bbd8e9a2a0c7d0130da1

data/README.md

@@ -53,11 +53,13 @@ core.start()
 | **organization** | Name of your organization on azure devops |
 | **project** | Name of your project on azure devops |
 | **repository** | Name of your project to using for clone and create pull requests |
-| **credentials** | A user credentials (_username_ and _password_) permission to clone e create pull requests |
+| **access_token** | A git credentials to clone e create pull requests |
 | **feed_id** | Your feed id npm/yarn on azure devops. Go to Azure Devops, your project _Artifacts_ > _Connect to feed_ > _npm_ and then you can find feed id in the url looks like `https://pkgs.dev.azure.com/your organization name/you feed id to be right here/_packaging/npm-packages/npm/registry/` |
-| **github_public_token** | A GitHub access token with read access to public repos. Go to your GitHub account _Settings_ > _Developer settings_ > _Personal access tokens_ and then _Generate new token_ |
+| **github_token** | Allows passing in a GitHub access token so that the API rate limiting is not exceeded. When the repository's visibility is public, the `github_token` must be an access token with read access to the public repositories. When repository visibility is private, the `github_token` must be an access token with full control of private repositories. |
 
-## Example
+## Examples
+
+### Azure Devops
 
 ```ruby
 require "dependabot/omnibus"
@@ -68,12 +70,30 @@ core = Rondabot::Core.new(
   organization: "Akatsuki",
   project: "Digital%20Channel",
   repository: "akatsuki-website",
-  credentials: {
-    :username => "Ronda.Bot",
-    :password => "cm9uZGluZWxsaW1vcmFpcwcm9uZGFib3Q"
-  },
+  access_token: "cm9uZGluZWxsaW1vcmFpcwcm9uZGFib3Q"
   feed_id: "11db190-e3b1872-1e6e6e-c97f2dd-49253",
-  github_public_token: "11db190e3b18721e6e6ec97f2dd49253"
+  github_token: "11db190e3b18721e6e6ec97f2dd49253"
+)
+
+core.start()
+```
+
+### GitHub
+
+> **WARNING**
+>
+> When the repository's visibility is public, the `github_token` must be an access token with read access to the public repositories.
+>
+> When repository visibility is private, the `github_token` must be an access token with full control of private repositories.
+
+```ruby
+require "dependabot/omnibus"
+require "rondabot"
+
+core = Rondabot::Core.new(
+  provider: "github",
+  repository: "rondinellimorais/rondabot",
+  github_token: "11db190e3b18721e6e6ec97f2dd49253"
 )
 
 core.start()

data/lib/module/Azure.rb

@@ -2,15 +2,17 @@ module Rondabot
   class Azure < SourceControl
     def initialize params
       super(params)
-      @repository = params[:repository]
       @project = params[:project]
 
-      user_credentials = get_user_credentials(params)
+      if params[:access_token].nil?
+        raise ArgumentError.new("'access_token' param is missing!")
+      end
+
       @credentials << {
         "type" => "git_source",
         "host" => "dev.azure.com",
-        "username" => user_credentials[:username],
-        "password" => user_credentials[:password]
+        "username" => "x-access-token",
+        "password" => params[:access_token]
       }
 
       # get organization
@@ -28,7 +30,7 @@ module Rondabot
       @credentials << {
         "type" => "npm_registry",
         "registry" => "https://pkgs.dev.azure.com/#{@organization}/#{@feed_id}/_packaging/npm-packages/npm/registry/",
-        "token" => "#{@feed_id}:#{user_credentials[:password]}"
+        "token" => "#{@feed_id}:#{params[:access_token]}"
       }
     end
 
@@ -43,5 +45,16 @@ module Rondabot
 
       return "#{@organization}/#{@project}/_git/#{@repository}"
     end
+
+    def create_pull_request params
+      pull_request = super(params)
+
+      if pull_request&.status == 201
+        content = JSON[pull_request.body]
+        puts "  PR ##{content["pullRequestId"]} submitted"
+      else
+        puts "  PR already exists or an error has occurred"
+      end
+    end
   end
 end

data/lib/module/Core.rb

@@ -13,8 +13,7 @@ module Rondabot
           # @source_control = Rondabot::GitLab.new(params)
           raise ArgumentError.new("gitlab available soon :)")
         when 'github'
-          # @source_control = Rondabot::GitHub.new(params)
-          raise ArgumentError.new("github available soon :)")
+          @source_control = Rondabot::GitHub.new(params)
         else
           raise ArgumentError.new("'provider' param is missing! The available values are: azure, gitlab or github.")
       end

data/lib/module/GitHub.rb

@@ -2,13 +2,23 @@ module Rondabot
   class GitHub < SourceControl
     def initialize params
       super(params)
-      
-      # get the user credentials
-      # user_credentials = get_user_credentials(params)
     end
 
     def repository_uri
-      raise "not implemented"
+      if @repository.nil?
+        raise ArgumentError.new("'repository' param is missing!")
+      end
+      return @repository
+    end
+
+    def create_pull_request params
+      pull_request = super(params)
+
+      if pull_request.state == 'open'
+        puts "  PR ##{pull_request.number} submitted"
+      else
+        puts "  PR already exists or an error has occurred"
+      end 
     end
   end
 end

data/lib/module/GitLab.rb

@@ -2,9 +2,6 @@ module Rondabot
   class GitLab < SourceControl
     def initialize params
       super(params)
-
-      # get the user credentials
-      # user_credentials = get_user_credentials(params)
     end
 
     def repository_uri

data/lib/module/SourceControl.rb

@@ -7,17 +7,22 @@ module Rondabot
     def initialize params
       @credentials = []
       @provider = params[:provider]
-
-      # A GitHub access token with read access to public repos
-      if params[:github_public_token].nil?
-        raise ArgumentError.new("'github_public_token' param is missing!")
+      @repository = params[:repository]
+
+      # When the repository's visibility is public,
+      # the `github_token` must be an access token with read access to the public repositories.
+      #
+      # When repository visibility is private,
+      # the `github_token` must be an access token with full control of private repositories.
+      if params[:github_token].nil?
+        raise ArgumentError.new("'github_token' param is missing!")
       end
 
       @credentials << {
         "type" => "git_source",
         "host" => "github.com",
         "username" => "x-access-token",
-        "password" => "#{params[:github_public_token]}"
+        "password" => "#{params[:github_token]}"
       }
     end
 
@@ -43,23 +48,7 @@ module Rondabot
         label_language: true
       )
 
-      pull_request = pr_creator.create
-
-      if pull_request&.status == 201
-        content = JSON[pull_request.body]
-        puts "  PR ##{content["pullRequestId"]} submitted"
-      else
-        puts "  PR already exists or an error has occurred"
-      end
-    end
-
-    private
-    def get_user_credentials(params)
-      _credentials = params[:credentials]
-      if _credentials.nil? || _credentials[:username].nil? || _credentials[:password].nil?
-        raise ArgumentError.new("'credentials' param is missing! Check your credentials parameter")
-      end
-      return _credentials
+      return pr_creator.create
     end
   end
 end

data/lib/rondabot.rb

@@ -1,5 +1,5 @@
 module Rondabot
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
   autoload :Option, File.join(File.dirname(__FILE__), 'module/Option')
   autoload :Core, File.join(File.dirname(__FILE__), 'module/Core')
   autoload :Version, File.join(File.dirname(__FILE__), 'module/Version')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rondabot
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Rondinelli Morais
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-14 00:00:00.000000000 Z
+date: 2020-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake