ass_launcher 0.2.2 → 0.3.0

data/lib/ass_launcher/cmd/designer.rb

@@ -0,0 +1,28 @@
+module AssLauncher
+  module Cmd
+    class Main
+      module SubCommands
+        # @api private
+        class Designer < Abstract::SubCommand
+          module SubCommands
+            class Cli < Abstract::Cli; end
+            # :nodoc:
+            class Run < Abstract::Run
+              include Abstract::Parameter::IB_PATH
+            end
+          end
+
+          def  self.command_name
+            'designer'
+          end
+
+          def self._banner
+            '1C:Enterprise Thick client in DESIGNER mode'
+          end
+
+          declare_subcommands
+        end
+      end
+    end
+  end
+end

data/lib/ass_launcher/cmd/makeib.rb

@@ -0,0 +1,59 @@
+module AssLauncher
+  module Cmd
+    class Main
+      module SubCommands
+        # @api private
+        class MakeIb < Abstract::SubCommand
+          include Abstract::Parameter::IB_PATH_NAME
+          include Abstract::Option::Dbms
+          include Abstract::Option::Dbsrv
+          include Abstract::Option::Esrv
+          include Abstract::Option::Pattern
+          include Abstract::Option::Version
+          include Abstract::Option::DryRun
+          include Abstract::Option::SearchPath
+          include Abstract::BinaryWrapper
+
+          def self.command_name
+            'makeib'
+          end
+
+          def self._banner
+            'Make new information base'
+          end
+
+          # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+          def connection_string
+            return cs_file(file: ib_path) if dbms == 'File'
+            cs = cs_srv(srvr: esrv_host, ref: ib_path)
+            cs.dbms = dbms
+            cs.dbsrvr = dbsrv_host
+            cs.db = ib_path
+            cs.dbuid = dbsrv_user
+            cs.dbpwd = dbsrv_pass
+            cs.crsqldb = 'Y'
+            cs.susr = esrv_user
+            cs.spwd = esrv_pass
+            cs
+          end
+          # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
+
+          def make_command
+            cs = connection_string
+            template = pattern
+            binary_wrapper.command(:createinfobase) do
+              connection_string cs
+              useTemplate template if template
+            end
+          end
+
+          def execute
+            cmd = run_enterprise(make_command)
+            puts Colorize.green(cmd.process_holder.result.assout) unless\
+              dry_run?
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ass_launcher/cmd/thick.rb

@@ -0,0 +1,28 @@
+module AssLauncher
+  module Cmd
+    class Main
+      module SubCommands
+        # @api private
+        class Thick < Abstract::SubCommand
+          module SubCommands
+            class Cli < Abstract::Cli; end
+            # :nodoc:
+            class Run < Abstract::Run
+              include Abstract::Parameter::IB_PATH
+            end
+          end
+
+          def self.command_name
+            'thick'
+          end
+
+          def self._banner
+            '1C:Enterprise Thick client in ENTERPRISE mode'
+          end
+
+          declare_subcommands
+        end
+      end
+    end
+  end
+end

data/lib/ass_launcher/cmd/thin.rb

@@ -0,0 +1,28 @@
+module AssLauncher
+  module Cmd
+    class Main
+      module SubCommands
+        # @api private
+        class Thin < Abstract::SubCommand
+          module SubCommands
+            class Cli < Abstract::Cli; end
+            # :nodoc:
+            class Run < Abstract::Run
+              include Abstract::Parameter::IB_PATH
+            end
+          end
+
+          def self.command_name
+            'thin'
+          end
+
+          def self._banner
+            '1C:Enterprise Thin client'
+          end
+
+          declare_subcommands
+        end
+      end
+    end
+  end
+end

data/lib/ass_launcher/cmd/web.rb

@@ -0,0 +1,62 @@
+module AssLauncher
+  module Cmd
+    class Main
+      module SubCommands
+        # @api private
+        class Web < Abstract::SubCommand
+          module SubCommands
+            class Cli < Abstract::Cli; end
+            # :nodoc:
+            class Uri < Abstract::SubCommand
+              include Abstract::Option::User
+              include Abstract::Option::Password
+              include Abstract::Option::Raw
+              include Abstract::Parameter::IB_PATH
+              include Abstract::ParseIbPath
+              include Abstract::ClientMode
+              include AssLauncher::Api
+
+              def self.command_name
+                'uri'
+              end
+
+              def self._banner
+                'Uri constructor for webclient'
+              end
+
+              def webclient
+                cl = web_client(ib_path)
+                cl.send(:add_to_query, cl.uri,
+                        cl.send(:args_to_query, raw_param.flatten))
+                cl
+              end
+
+              def location
+                user_ = user
+                pass_ = password
+                webclient.location do
+                  _N user_ if user_
+                  _P pass_ if pass_
+                end.to_s
+              end
+
+              def execute
+                puts Colorize.yellow location.to_s
+              end
+            end
+          end
+
+          def self.command_name
+            'web'
+          end
+
+          def self._banner
+            '1C:Enterprise Web client'
+          end
+
+          declare_subcommands
+        end
+      end
+    end
+  end
+end

data/lib/ass_launcher/enterprise/cli_def/8.2.17.rb

@@ -111,6 +111,8 @@ module AssLauncher::Enterprise::CliDef
                                  :- => 'поиск не выполняется')
       path_exist '/RunShortcut',
         'позволяет запустить систему со списком баз из указанного файла v8i'
+
+      string '/UC', 'код для установки соединения с заблокированной базой'
     end
 
     mode :enterprise do
@@ -119,7 +121,6 @@ module AssLauncher::Enterprise::CliDef
         'запуск толстого клиента в режиме обычного приложения', thick
       flag '/RunModeManagedApplication',
         'запуск толстого клиента в режиме управляемого приложения', thick
-      string '/UC', 'код для установки соединения с заблокированной базой'
       path_exist '/Execute', 'запуска внешней обработки в режиме 1С:Предприятие непосредственно после старта системы'
       flag '/ClearCache', 'очистка кэша клиент-серверных вызовов'
       flag '/itdi', 'режим интерфейса с использованием закладок'
@@ -183,17 +184,6 @@ module AssLauncher::Enterprise::CliDef
           switch_value: (Proc.new do |value|; ":#{value}" end)
       end
 
-      path '/CreateDistributive',
-        'создания комплекта поставки в указанном каталоге' do
-        path_exist '-File', 'имя файла описания комплекта поставки'
-        string '-Option','вариант поставки'
-        switch '-Make', 'создать',
-          switch_list: switch_list(
-          Setup: 'комплект поставки (используется по умолчанию)',
-          Files: 'файлы поставки'
-          )
-        path_exist '-digisign', 'файл с параметрами лицензирования'
-      end
       flag '/ResetMasterNode', 'сброс главного узла РИБ'
       flag '/CheckConfig',
         'централизованная проверка конфигурации' do
@@ -293,7 +283,19 @@ module AssLauncher::Enterprise::CliDef
         path '-cfufile', 'создать обновление дистрибутива (.cfu файл)'
         path '-f', 'дистрибутив включаемый в обновление (.cf файл)'
         string '-v', 'версия дистрибутива включаемого в обновление'
-        path_exist '–digisign', 'файл с параметрами лицензирования'
+        path_exist '-digisign', 'файл с параметрами лицензирования'
+      end
+
+      path '/CreateDistributive',
+        'создания комплекта поставки в указанном каталоге' do
+        path_exist '-File', 'имя файла описания комплекта поставки'
+        string '-Option','вариант поставки'
+        switch '-Make', 'создать',
+          switch_list: switch_list(
+          Setup: 'комплект поставки (используется по умолчанию)',
+          Files: 'файлы поставки'
+          )
+        path_exist '-digisign', 'файл с параметрами лицензирования'
       end
     end
   end

data/lib/ass_launcher/enterprise/cli_def/8.3.6.rb

@@ -78,10 +78,10 @@ module AssLauncher::Enterprise::CliDef
     mode :designer do
       flag '/ConfigurationRepositoryBindCfg',
         'подключение неподключенной конфигурации к хранилищу' do
-        flag '–forceBindAlreadyBindedUser',
+        flag '-forceBindAlreadyBindedUser',
           'подключение будет выполнено даже в случае, если для данного'\
           ' пользователя уже есть конфигурация, связанная с данным хранилищем'
-        flag '–forceReplaceCfg',
+        flag '-forceReplaceCfg',
           'если конфигурация не пустая, текущая конфигурация'\
           ' будет заменена конфигурацией из хранилища'
       end

data/lib/ass_launcher/support/connection_string.rb

@@ -279,7 +279,7 @@ module AssLauncher
         # Build args array suitable for
         # :createinfibase runmode
         def createinfobase_args
-          [createinfobase_cmd]
+          [createinfobase_cmd.gsub(%r{=\s*"},"='").gsub(%r{"\s*;},"';")]
         end
 
         # (see DBMS_VALUES)

data/lib/ass_launcher/support/shell/process_holder.rb

@@ -112,7 +112,7 @@ module AssLauncher
         # @raise [RunProcessError] if command is cmd.exe with /K key see
         #  {cmd_exe_with_k?}
         # @api public
-        # @raise (see initialize)
+        # @raise [ArgumentError] if command was already running
         def self.run(command, options = {})
           fail RunProcessError, 'Forbidden run cmd.exe with /K key'\
             if cmd_exe_with_k? command
@@ -122,7 +122,7 @@ module AssLauncher
         end
 
         # @param (see run)
-        # @raise [ArgumentError] if command was already running
+        # @raise (see run)
         def initialize(command, options = {})
           fail ArgumentError, 'Command was already running' if command.running?
           @command = command

data/lib/ass_launcher/version.rb

@@ -1,5 +1,5 @@
 module AssLauncher
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
   module KNOWN_ENTERPRISE_VERSIONS
     require 'ass_launcher/enterprise/cli_defs_loader'
     extend AssLauncher::Enterprise::CliDefsLoader

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ass_launcher
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Leonid Vlasov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-15 00:00:00.000000000 Z
+date: 2017-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inifile
@@ -52,6 +52,48 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.4.0
+- !ruby/object:Gem::Dependency
+  name: clamp
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: command_line_reporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -136,20 +178,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: clamp
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: coderay
   requirement: !ruby/object:Gem::Requirement
@@ -167,11 +195,13 @@ dependencies:
 description: Don't ask why this necessary. Believe this necessary!
 email:
 - leoniv.vlasov@gmail.com
-executables: []
+executables:
+- ass-launcher
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - ".simplecov"
 - ".travis.yml"
 - Gemfile
@@ -201,8 +231,15 @@ files:
 - examples/troubles/with_running_1c_example.rb
 - examples/v8i_file_example.rb
 - examples/webclient_example.rb
+- exe/ass-launcher
 - lib/ass_launcher.rb
 - lib/ass_launcher/api.rb
+- lib/ass_launcher/cmd.rb
+- lib/ass_launcher/cmd/designer.rb
+- lib/ass_launcher/cmd/makeib.rb
+- lib/ass_launcher/cmd/thick.rb
+- lib/ass_launcher/cmd/thin.rb
+- lib/ass_launcher/cmd/web.rb
 - lib/ass_launcher/enterprise.rb
 - lib/ass_launcher/enterprise/binary_wrapper.rb
 - lib/ass_launcher/enterprise/cli.rb
@@ -257,9 +294,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Ruby wrapper for 1C:Enterprise platform
 test_files: []
-has_rdoc: