run-redmine 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba3d618bde174f14d8af56da849947bced99881882598046fdfa27aca8d57a06
-  data.tar.gz: 9312f1f764d987b6dd124aae6bf56d28315d4c16638876575e9d10b0e1101990
+  metadata.gz: a5e72f3968d4effd9930cc745514d9146d1a9f3cabad2743d5a72dcaccc5f256
+  data.tar.gz: 59f802a957d7b642fa53a888d1902486d60caf02c0c0996f2b4f8dfa9ef2e411
 SHA512:
-  metadata.gz: 8c960aaa80afc8c848212f485d92836808399e53682909ca5873019062466197bea16810fab0adb9e8b4511cffbff34a5340934f2e1dfb709d0238123f5e5133
-  data.tar.gz: 102f9e8239110aedcd2a6ffe5c4e04555df35799d367f0605da390905e67e55225da76c3fb3d3a94f351c5170b7652ba4b96b84ca58d365c871fc8632e985782
+  metadata.gz: fd5047bfb32ab58b68aa265f6e2a3cfe31a53c750812c075aa5d604edc80093241b86cb03a708f963d6c8acefcced91ba8652dfeb23a8a7d3bc407b183d50961
+  data.tar.gz: 9c1c25b70a01a6d04e0b6926e49caa81c6357b9888af7ce2020335705998321b603a0fe35a3f0ceeffae5687765678d2eb99183a0c17362cb1efc4b7e386caa4

data/docker/Dockerfile

@@ -69,7 +69,7 @@ RUN mkdir /root/.ssh
 ADD ./sshconfig /root/.ssh/config
 RUN chmod -R 600 /root/.ssh
 
-RUN gem install run-redmine --no-ri --no-rdoc && rbenv rehash
+RUN gem install run-redmine -v 1.0.1 --no-ri --no-rdoc && rbenv rehash
 
 ARG port=3000
 ENV PORT=$port

data/lib/redmine/cli/arguments.rb

@@ -3,7 +3,7 @@
 module Redmine
   module CLI
     class Arguments
-      attr_accessor :command, :instance_name, :config_path, :plugins_path
+      attr_accessor :command, :instance_name, :config_path, :plugins_path, :privileged
     end
   end
 end

data/lib/redmine/cli/command_factory.rb

@@ -2,6 +2,11 @@
 
 require_relative '../commands/start'
 require_relative '../commands/pull_plugins'
+require_relative '../commands/stop'
+require_relative '../commands/show'
+require_relative '../commands/shell'
+require_relative '../commands/help'
+require_relative '../commands/logs'
 
 module Redmine
   module CLI
@@ -19,6 +24,16 @@ module Redmine
           Redmine::Commands::List.new
         when Redmine::CLI::Parser::COMMAND_INSTALL_PLUGINS
           Redmine::Commands::PullPlugins.new(@arguments)
+        when Redmine::CLI::Parser::COMMAND_STOP
+          Redmine::Commands::Stop.new(@arguments)
+        when Redmine::CLI::Parser::COMMAND_SHOW
+          Redmine::Commands::Show.new(@arguments)
+        when Redmine::CLI::Parser::COMMAND_SHELL
+          Redmine::Commands::Shell.new(@arguments)
+        when Redmine::CLI::Parser::COMMAND_HELP
+          Redmine::Commands::Help.new
+        when Redmine::CLI::Parser::COMMAND_LOGS
+          Redmine::Commands::Logs.new(@arguments)
         else
           raise Redmine::CLI::UnclearCommand, @arguments.command
         end

data/lib/redmine/cli/parser.rb

@@ -13,11 +13,13 @@ module Redmine
     class Parser
       COMMANDS = [
         COMMAND_START           = 'start',
+        COMMAND_STOP            = 'stop',
         COMMAND_LIST            = 'list',
         COMMAND_SHOW            = 'show',
         COMMAND_SHELL           = 'shell',
-        COMMAND_PULL            = 'pull',
-        COMMAND_INSTALL_PLUGINS = 'install-plugins'
+        COMMAND_INSTALL_PLUGINS = 'install-plugins',
+        COMMAND_HELP            = 'help',
+        COMMAND_LOGS            = 'logs',
       ].freeze
 
       attr_reader :arguments
@@ -30,12 +32,18 @@ module Redmine
 
       def parse(args)
         @arguments = ::Redmine::CLI::Arguments.new
-        # options = OpenStruct.new
         opt_parser = OptionParser.new do |opts|
+          opts.on('-p', '--privileged', 'Run in privileged mode') do |p|
+            @arguments.privileged = p
+          end
         end
 
         opt_parser.parse!(args)
-        parse_remainings(args)
+        if (args.size > 0)
+          parse_remainings(args)
+        else
+          print_help
+        end
       end
 
       def parse_remainings(args)
@@ -43,14 +51,18 @@ module Redmine
         case command
         when COMMAND_START
           @arguments.command = COMMAND_START
+        when COMMAND_STOP
+          process_stop_command(args)
         when COMMAND_LIST
           @arguments.command = COMMAND_LIST
         when COMMAND_SHOW
           process_show_command(args)
         when COMMAND_SHELL
           process_shell_command(args)
-        when COMMAND_PULL
-          process_pull_command(args)
+        when COMMAND_HELP
+          print_help
+        when COMMAND_LOGS
+          process_logs_command(args)
         when COMMAND_INSTALL_PLUGINS
           process_install_plugins_command(args)
         else
@@ -59,18 +71,23 @@ module Redmine
         end
       end
 
+      def process_stop_command(args)
+        @arguments.command = COMMAND_STOP
+        @arguments.instance_name = args.shift
+      end
+
       def process_show_command(args)
         @arguments.command = COMMAND_SHOW
         @arguments.instance_name = args.shift
       end
 
-      def process_shell_command(args)
-        @arguments.command = COMMAND_SHELL
+      def process_logs_command(args)
+        @arguments.command = COMMAND_LOGS
         @arguments.instance_name = args.shift
       end
 
-      def process_pull_command(args)
-        @arguments.command = COMMAND_PULL
+      def process_shell_command(args)
+        @arguments.command = COMMAND_SHELL
         @arguments.instance_name = args.shift
       end
 
@@ -79,6 +96,10 @@ module Redmine
         @arguments.config_path = args.shift
         @arguments.plugins_path = args.shift
       end
+
+      def print_help
+        @arguments.command = COMMAND_HELP
+      end
     end
   end
 end

data/lib/redmine/commands/docker/create.rb

@@ -4,12 +4,20 @@ module Redmine
   module Commands
     module Docker
       class Create
-        def initialize(config)
-          @config = config
+        def initialize(config, arguments)
+          @config    = config
+          @arguments = arguments
         end
 
         def command_line
-          "docker create --name=#{@config.name} --mount type=bind,source=#{File.expand_path(@config.key)},target=/root/.ssh/id_rsa --mount type=bind,source=#{File.expand_path(@config.key)}.pub,target=/root/.ssh/id_rsa.pub -e PORT=#{@config.port} -p #{@config.port}:#{@config.port} --mount source=redmine-pg,target=/var/lib/postgresql/9.5/main redmineup/demo-base"
+          "docker create --name=#{@config.name} #{privileged_mode} --mount type=bind,source=#{File.expand_path(@config.key)},target=/root/.ssh/id_rsa --mount type=bind,source=#{File.expand_path(@config.key)}.pub,target=/root/.ssh/id_rsa.pub -e PORT=#{@config.port} -p #{@config.port}:#{@config.port} --mount source=redmine-pg,target=/var/lib/postgresql/9.5/main redmineup/demo-base"
+        end
+
+        private
+
+        def privileged_mode
+          return '' unless @arguments.privileged
+          '--privileged'
         end
       end
     end

data/lib/redmine/commands/help.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Redmine
+  module Commands
+    class Help
+      def execute
+        puts <<~HELP
+          Usage:
+              redmine [options] <command>
+
+          Where OPTIONS:
+              -p --privileged - Run in privileged mode (required for occupying ports below 1024)
+
+          Where COMMANDS:
+              start - run redmine
+              list  - inspect list of running instances
+              show  - print information about specific instance
+              shell - get shell into specific instance
+              install_plugins <config> <destination folder> - for internal use
+              logs  - start tailing logs
+        HELP
+      end
+    end
+  end
+end

data/lib/redmine/commands/list.rb

@@ -2,18 +2,19 @@
 
 require 'ostruct'
 
-require_relative './shell'
+require_relative '../utils/system'
+require_relative './list_printer'
 
 module Redmine
   module Commands
     DOCKER_LIST_COMMAND = 'docker ps'
     class List
       def results
-        parse(Shell.new.execute('docker ps'))
+        parse(Redmine::Utils::System.new.execute_and_return('docker ps'))
       end
 
       def execute
-        Redmine::Commands::ListPrinter.new.print_results(results)
+        Redmine::Commands::ListPrinter.new.print(results)
       end
 
       private

data/lib/redmine/commands/logs.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Redmine
+  module Commands
+    class Logs
+      def initialize(args)
+        @args = args
+      end
+
+      def execute
+        shell.execute(
+          "docker exec -it redmine-run__#{@args.instance_name} /usr/bin/tail -f /var/www/redmine/log/development.log"
+        )
+      end
+
+      private
+
+      def shell
+        @shell ||= Redmine::Utils::System.new
+      end
+    end
+  end
+end

data/lib/redmine/commands/shell.rb

@@ -1,8 +1,22 @@
+# frozen_string_literal: true
+
 module Redmine
   module Commands
     class Shell
-      def execute(cmd)
-        Kernel.system cmd
+      def initialize(args)
+        @args = args
+      end
+
+      def execute
+        shell.execute(
+          "docker exec -it redmine-run__#{@args.instance_name} /bin/bash"
+        )
+      end
+
+      private
+
+      def shell
+        @shell ||= Redmine::Utils::System.new
       end
     end
   end

data/lib/redmine/commands/show.rb

@@ -0,0 +1,22 @@
+module Redmine
+    module Commands
+      class Show
+        def initialize(args)
+          @args = args
+        end
+  
+        def execute
+          shell.execute(
+            "docker exec -it redmine-run__#{@args.instance_name} cat /config.yml"
+          )
+        end
+  
+        private
+  
+        def shell
+          @shell ||= Redmine::Utils::System.new
+        end
+      end
+    end
+  end
+  

data/lib/redmine/commands/start.rb

@@ -21,7 +21,7 @@ module Redmine
       def execute
         run_command Redmine::Commands::Docker::Build.new(config).command_line
         run_command Redmine::Commands::Docker::CreateVolume.new(config).command_line
-        run_command Redmine::Commands::Docker::Create.new(config).command_line
+        run_command Redmine::Commands::Docker::Create.new(config, arguments).command_line
         run_command Redmine::Commands::Docker::CopyConfig.new(config).command_line
         run_command Redmine::Commands::Docker::Start.new(config).command_line
       end
@@ -39,11 +39,9 @@ module Redmine
             end
           }
 
-          t_err = Thread.new {
-            until error.eof?
-              putc error.readchar
-            end
-          }
+          t_err = Thread.new do
+            putc error.readchar until error.eof?
+          end
 
           t_out = Thread.new {
             until output.eof?
@@ -51,8 +49,11 @@ module Redmine
             end
           }
 
-          Process::waitpid(process_thread.pid) rescue nil 
-          # "rescue nil" is there in case process already ended.
+          begin
+            Process.waitpid(process_thread.pid)
+          rescue StandardError
+            nil
+          end
 
           t_err.join
           t_out.join

data/lib/redmine/commands/stop.rb

@@ -0,0 +1,24 @@
+module Redmine
+  module Commands
+    class Stop
+      def initialize(args)
+        @args = args
+      end
+
+      def execute
+        shell.execute(
+          "docker stop redmine-run__#{@args.instance_name}"
+        )
+        shell.execute(
+          "docker rm redmine-run__#{@args.instance_name}"
+        )
+      end
+
+      private
+
+      def shell
+        @shell ||= Redmine::Utils::System.new
+      end
+    end
+  end
+end

data/lib/redmine/utils/plugin_installer.rb

@@ -1,3 +1,7 @@
+# frozen_string_literal: true
+
+require_relative './system'
+
 module Redmine
   module Utils
     class PluginInstaller
@@ -27,7 +31,7 @@ module Redmine
       end
 
       def shell
-        @shell ||= Redmine::Commands::Shell.new
+        @shell ||= Redmine::Utils::System.new
       end
 
       def clone_plugin
@@ -48,14 +52,12 @@ module Redmine
       end
 
       def bundle
-        puts "bundling"
         shell.execute(
           "cd #{dest_dir}; cd ..; bundle"
         )
       end
 
       def migrate
-        puts "migrating"
         shell.execute(
           "cd #{dest_dir}; cd ..; bundle exec rake redmine:plugins"
         )

data/lib/redmine/utils/system.rb

@@ -0,0 +1,13 @@
+module Redmine
+  module Utils
+    class System
+      def execute(cmd)
+        Kernel.system cmd
+      end
+
+      def execute_and_return(cmd)
+        `#{cmd}`
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: run-redmine
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Andrei Malyshev
@@ -34,13 +34,18 @@ files:
 - lib/redmine/commands/docker/create.rb
 - lib/redmine/commands/docker/create_volume.rb
 - lib/redmine/commands/docker/start.rb
+- lib/redmine/commands/help.rb
 - lib/redmine/commands/list.rb
 - lib/redmine/commands/list_printer.rb
+- lib/redmine/commands/logs.rb
 - lib/redmine/commands/pull_plugins.rb
 - lib/redmine/commands/shell.rb
+- lib/redmine/commands/show.rb
 - lib/redmine/commands/start.rb
+- lib/redmine/commands/stop.rb
 - lib/redmine/config.rb
 - lib/redmine/utils/plugin_installer.rb
+- lib/redmine/utils/system.rb
 homepage: https://redmineup.com
 licenses:
 - MIT