ruboty-bundler 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 291a77afd6dfc021d4027d0a21172d8af03c476c
-  data.tar.gz: 719314d2150d0ab3e52f144a9928cdcf79f8fea3
+  metadata.gz: b6a1d555d04a3c52fea096e09f7e26910e5029fd
+  data.tar.gz: 1c8f0a0c0e714c5c6695208531597eef69ec0a38
 SHA512:
-  metadata.gz: bc3bca104b808d49addfcdbc8ef21eaf1fba2991849b3023ae2ba08e1c5664fbbbc20ceb6b588f9b54bf1f89620669d4f7a3d0573a7ba61297467ecb390ee271
-  data.tar.gz: 72fef39cb97984922af7572361d7cbaad6566fdcf17d2e033281094b68bcbf891a47245dfdf55f9b106522df2de3d897b663fdf58f744dce7ac35ac4e5967cb4
+  metadata.gz: 00d94a9f9eb8b6ba333104bb3fc570678f0df880039c5daa990f8914398745fee27b63a5209f87d96d7b18a0e8d7cdb1840c7556bb8e83f626f35051f342f5e7
+  data.tar.gz: 232d481002d5d4a04720881eeee223c19e9b4d9d78af2446726f7a7057fe1897160d8aefee92fb3b7853ae8be58e360f63ad17aa2f0152d13574bc243c5accce

data/CHANGELOG.md

@@ -0,0 +1,5 @@
+## 0.1.1
+- Add delete command
+
+## 0.1.0
+- 1st Release :tada:

data/lib/ruboty/bundler/version.rb

@@ -1,5 +1,5 @@
 module Ruboty
   module Bundler
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

data/lib/ruboty/handlers/bundler.rb

@@ -7,8 +7,6 @@ require "tmpdir"
 module Ruboty
   module Handlers
     class Bundler < Base
-      DEFAULT_GIT_REPOSITORY_PATH = "/tmp/app"
-      DEFAULT_GITHUB_HOST = "github.com"
       NAMESPACE = Ruboty::Github::Actions::Base::NAMESPACE
 
       env :RUBOTY_BUNDLER_REPOSITORY, "Target repository name (e.g. r7kamura/kokodeikku_bot)"
@@ -28,30 +26,15 @@ module Ruboty
       def add(message)
         if client = client_for(message.from_name)
           message.reply("Bundler started")
-          response = client.contents(repository, path: "Gemfile")
-          gemfile_content = Base64.decode64(response[:content])
-          gemfile_lock_content = Base64.decode64(client.contents(repository, path: "Gemfile.lock")[:content])
-          gems = Gems.new(gemfile: gemfile_content, gemfile_lock: gemfile_lock_content)
+          gems = Gems.new(
+            gemfile_content: Base64.decode64(client.get("Gemfile")[:content]),
+            gemfile_lock_content: Base64.decode64(client.get("Gemfile.lock")[:content]),
+          )
           gems.add(message[:gem_name], version: message[:version])
-          gemfile_content = gems.to_s
-          gemfile_sha = response[:sha]
+          gemfile_content = GemfileView.new(gems).to_s
           gemfile_lock_content = Install.new(gemfile_content).call
-          gemfile_lock_sha = client.contents(repository, path: "Gemfile.lock")[:sha]
-          commit_message = "Add #{message[:gem_name]} gem"
-          client.update_contents(
-            repository,
-            "Gemfile",
-            commit_message,
-            gemfile_sha,
-            gemfile_content,
-          )
-          client.update_contents(
-            repository,
-            "Gemfile.lock",
-            commit_message,
-            gemfile_lock_sha,
-            gemfile_lock_content,
-          )
+          client.update("Gemfile", gemfile_content)
+          client.update("Gemfile.lock", gemfile_lock_content)
           message.reply("Bundler finished")
         else
           message.reply("I don't know your GitHub access token")
@@ -60,12 +43,26 @@ module Ruboty
         message.reply("Failed to add gem")
       end
 
-      # TODO
       def delete(message)
         if client = client_for(message.from_name)
+          message.reply("Bundler started")
+          gems = Gems.new(
+            gemfile_content: Base64.decode64(client.get("Gemfile")[:content]),
+            gemfile_lock_content: Base64.decode64(client.get("Gemfile.lock")[:content]),
+          )
+          gems.delete(message[:gem_name])
+          gemfile_content = GemfileView.new(gems).to_s
+          gemfile_lock_content = Install.new(gemfile_content).call
+          client.update("Gemfile", gemfile_content)
+          client.update("Gemfile.lock", gemfile_lock_content)
+          message.reply("Bundler finished")
         else
           message.reply("I don't know your GitHub access token")
         end
+      rescue GemNotFound
+        message.reply("Gem not found")
+      rescue Errno::ENOENT
+        message.reply("Failed to delete gem")
       end
 
       private
@@ -75,17 +72,57 @@ module Ruboty
         robot.brain.data[NAMESPACE] ||= {}
       end
 
-      def api_endpoint
-        "https://#{github_host}/api/v3" if github_host
-      end
-
       # @param username [String, nil]
-      # @return [Octokit::Client, nil]
+      # @return [Ruboty::Bundler::Client, nil]
       def client_for(username)
         if access_token = access_tokens_table[username]
-          Octokit::Client.new(
+          Client.new(access_token: access_token)
+        end
+      end
+
+      class Client
+        DEFAULT_GITHUB_HOST = "github.com"
+
+        def initialize(access_token: nil)
+          @access_token = access_token
+        end
+
+        # @param path [String] File path (e.g. "Gemfile")
+        # @return [String] File content
+        def get(path)
+          cache[path] ||= octokit_client.contents(repository, path: path)
+        end
+
+        # @param path [String] File path (e.g. "Gemfile")
+        # @param content [String] File content
+        def update(path, content)
+          octokit_client.update_contents(
+            repository,
+            path,
+            "Update #{path}",
+            get(path)[:sha],
+            content,
+          )
+        end
+
+        private
+
+        def api_endpoint
+          "https://#{github_host}/api/v3" if github_host
+        end
+
+        def cache
+          @cache ||= {}
+        end
+
+        def github_host
+          ENV["GITHUB_HOST"]
+        end
+
+        def octokit_client
+          @octokit_client ||= Octokit::Client.new(
             {
-              access_token: access_token,
+              access_token: @access_token,
               api_endpoint: api_endpoint,
               web_endpoint: web_endpoint,
             }.reject do |key, value|
@@ -93,26 +130,14 @@ module Ruboty
             end
           )
         end
-      end
 
-      def git_repository_path
-        DEFAULT_GIT_REPOSITORY_PATH
-      end
-
-      def git_repository_url
-        web_endpoint + ENV["RUBOTY_BUNDLER_REPOSITORY"]
-      end
-
-      def github_host
-        ENV["GITHUB_HOST"]
-      end
-
-      def repository
-        ENV["RUBOTY_BUNDLER_REPOSITORY"]
-      end
+        def repository
+          ENV["RUBOTY_BUNDLER_REPOSITORY"]
+        end
 
-      def web_endpoint
-        "https://#{github_host || DEFAULT_GITHUB_HOST}/"
+        def web_endpoint
+          "https://#{github_host || DEFAULT_GITHUB_HOST}/"
+        end
       end
 
       class DependencyView
@@ -141,12 +166,28 @@ module Ruboty
         end
       end
 
+      class GemfileView
+        def initialize(gems)
+          @gems = gems
+        end
+
+        def to_s
+          %<source "https://rubygems.org"\n\n> +
+          @gems.dependencies.map do |dependency|
+            DependencyView.new(dependency).to_s
+          end.join("\n")
+        end
+      end
+
+      class GemNotFound < StandardError
+      end
+
       class Gems
-        # @param gemfile [String] Content of Gemfile
-        # @param gemfile_lcok [String] Content of Gemfile.lock
-        def initialize(gemfile: nil, gemfile_lock: nil)
-          @gemfile = gemfile
-          @gemfile_lock = gemfile_lock
+        # @param gemfile_content [String]
+        # @param gemfile_lcok_content [String]
+        def initialize(gemfile_content: nil, gemfile_lock_content: nil)
+          @gemfile_content = gemfile_content
+          @gemfile_lock_content = gemfile_lock_content
         end
 
         def add(gem_name, version: nil)
@@ -156,16 +197,13 @@ module Ruboty
           dependencies << ::Bundler::Dependency.new(gem_name, version || ">= 0")
         end
 
-        # @return [String] Valid Gemfile content
-        def to_s
-          %<source "https://rubygems.org"\n\n> +
-          dependencies.map do |dependency|
-            DependencyView.new(dependency).to_s
-          end.join("\n")
+        def delete(gem_name)
+          raise GemNotFound if dependencies.all? {|dependency| dependency.name != gem_name }
+          dependencies.reject! do |dependency|
+            dependency.name == gem_name
+          end
         end
 
-        private
-
         def dependencies
           @dependencies ||= ::Bundler::Dsl.evaluate(
             gemfile_file.path,
@@ -174,16 +212,18 @@ module Ruboty
           ).dependencies
         end
 
+        private
+
         def gemfile_file
           @gemfile_file ||= Tempfile.new("Gemfile").tap do |file|
-            file.write(@gemfile)
+            file.write(@gemfile_content)
             file.flush
           end
         end
 
         def gemfile_lock_file
           @gemfile_lock_file ||= Tempfile.new("Gemfile.lock").tap do |file|
-            file.write(@gemfile_lock)
+            file.write(@gemfile_lock_content)
             file.flush
           end
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruboty-bundler
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Ryo Nakamura
@@ -74,6 +74,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md