rdm 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0f78d232d36dc1f22ead77c386634b1136da103
-  data.tar.gz: 768e4ce4671b3f658183eb3b6e9c9e578d7cd8a8
+  metadata.gz: 3be7fa147c5deb0f944dc1919c638b944f52f604
+  data.tar.gz: 77704c0186a53483449b4ef3a901049eac2ecc48
 SHA512:
-  metadata.gz: f78f8e981907ad2857ef1cfc20d0c311c0f8b2584958d3b0c5c9d836ae19d5d50e47d11b8f707f4cc88f5822d359f16433cec4c0bd8d6fd5eb3820cb03836340
-  data.tar.gz: 6c78593c2e6aa59257638dcdf4cc3a63ec581c70b82e62e90f6aef4d170dbf7f16ed8e3d4b4beedefdb563e1e5ac835ed6fe66f6e811f5ba52d0b75050b54653
+  metadata.gz: efcbc5233713e6b73b2d465188591a8ea7e1788c69b04c756a7fcdd98852146da7e215bf2ea004d45879456a2ad49db01c824b16c4ee899f334e48394fae303b
+  data.tar.gz: a252eece0678566eede4498e3878d5939256f05040383041bef8cbd74067175a59bad0759d75e63f5def62a927a697039390eb6bbccc54febec9bd2450625600

data/.gitignore

@@ -1,5 +1,4 @@
 .DS_Store
-Gemfile.lock
 Package.rb.lock
 pkg
 coverage/

data/Gemfile.lock

@@ -0,0 +1,80 @@
+PATH
+  remote: .
+  specs:
+    rdm (0.3.0)
+      activesupport
+      commander (~> 4.4)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (5.1.2)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    ast (2.3.0)
+    byebug (9.0.6)
+    codecov (0.1.10)
+      json
+      simplecov
+      url
+    commander (4.4.3)
+      highline (~> 1.7.2)
+    concurrent-ruby (1.0.5)
+    diff-lcs (1.3)
+    docile (1.1.5)
+    highline (1.7.8)
+    i18n (0.8.4)
+    json (2.0.3)
+    minitest (5.10.2)
+    parser (2.3.3.1)
+      ast (~> 2.2)
+    powerpack (0.1.1)
+    rainbow (2.2.1)
+    rake (12.0.0)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.4)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    rubocop (0.46.0)
+      parser (>= 2.3.1.1, < 3.0)
+      powerpack (~> 0.1)
+      rainbow (>= 1.99.1, < 3.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    ruby-progressbar (1.8.1)
+    simplecov (0.14.1)
+      docile (~> 1.1.0)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
+    thread_safe (0.3.6)
+    tzinfo (1.2.3)
+      thread_safe (~> 0.1)
+    unicode-display_width (1.1.2)
+    url (0.3.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.3)
+  byebug
+  codecov
+  rake
+  rdm!
+  rspec
+  rubocop (~> 0.46)
+
+BUNDLED WITH
+   1.15.1

data/bin/rdm

@@ -26,12 +26,12 @@ class RdmCliRunner
       c.example 'generate scaffold with pry',      'rdm init --console=pry'
       c.option '--test FRAMEWORK', TESTFRAMEWORKS, "select test framework: #{TESTFRAMEWORKS.join(", ")}"
       c.option '--console CONSOLE', CONSOLES, "select console: #{CONSOLES.join(", ")}"
-      c.option '--current_dir [ROOT_DIR]', String, 'Path for the root folder'
+      c.option '--current_path [ROOT_DIR]', String, 'Path for the root folder'
       c.action do |args, options|
         defaults = {
-          test:        "rspec",
-          console:     "irb",
-          current_dir: `pwd`.strip
+          test:         "rspec",
+          console:      "irb",
+          current_path: `pwd`.strip
         }
         options_with_defaults = defaults.merge!(options.__hash__)
         Rdm::CLI::Init.run(options_with_defaults)
@@ -47,16 +47,14 @@ class RdmCliRunner
       c.example 'generate pack/age package',
                   'rdm gen.package pack/age --path subsystems/package'
       c.example 'generate events package within /some/other/path folder',
-                  'rdm gen.package events --path core/domain/events --current_dir /some/other/path'
-      c.example 'generate auth package without tests', 'rdm gen.package auth --path subsystems/auth --skip-tests'
+                  'rdm gen.package events --path core/domain/events --current_path /some/other/path'
+      c.example 'generate auth package without tests', 'rdm gen.package auth --path subsystems/auth'
       c.option '--path [RELATIVE_PATH]', String, 'Path for the package'
-      c.option '--current_dir [ROOT_DIR]', String, 'Path for the root folder'
-      c.option '--skip-test', '--skip-tests', 'Don\'t generate test files'
+      c.option '--current_path [ROOT_DIR]', String, 'Path for the root folder'
       c.action do |args, options|
         package_name = (args.first || "")
         defaults = {
-          skip_tests:   false,
-          current_dir:  `pwd`.chomp,
+          current_path: `pwd`.chomp,
           package_name: package_name,
           path:         package_name.downcase.gsub(/\s+/, '_')
         }
@@ -64,6 +62,76 @@ class RdmCliRunner
         Rdm::CLI::GenPackage.run(options_with_defaults)
       end
     end
+    
+    command :"git.diff" do |c|
+      c.syntax      = 'rdm git.diff REVISION'
+      c.description = 'show list of modified packages from git revision'
+      c.summary     = '> ' + c.description
+      c.example 'show list of modified packages from master',
+                'rdm git.diff master'
+      c.action do |args, options|
+        revision = (args.first || "HEAD")
+        options = {
+          path:     `pwd`.chomp,
+          revision: revision,
+        }
+        Rdm::CLI::DiffPackage.run(options)
+      end
+    end
+
+    command :"compile.package" do |c|
+      c.syntax = 'rdm compile.package PACKAGE_NAME [options]'
+      c.description = 'copy specified package and its dependencies to some folder'
+      c.summary = '> ' + c.description
+      c.example 'compilation of "commands" package to /tmp/commands dir',
+                'rdm compile.package commands --path /tmp/commands'
+      c.option '--path [COMPILE_PATH]', String, 'Path for compiled package'
+      c.action do |args, options|
+        package_name = (args.first || "")
+        opts = {
+          project_path: `pwd`.chomp,
+          package_name: package_name,
+          compile_path: options.path
+        }
+        Rdm::CLI::CompilePackage.compile(opts)
+      end
+    end
+
+    command :"gen.template" do |c|
+      c.syntax = 'rdm gen.template TEMPLATE_NAME [options]'
+      c.description = 'generates template from ROOT/.rdm/templates folder with specified variables'
+      c.summary = '> ' + c.description
+      c.example 'creating new repository, mapper and dao files',
+                'rdm gen.template repository --path infrastructure/storage'
+      c.option '--path [DESTINATION_PATH]', String, 'Location of generated folders'
+      c.option '--OPTION_NAME [OPTION_VALUE]', String, 'Local variables for template handler'
+      c.action do |args, options|
+        options_hash = options.__hash__
+
+        Rdm::CLI::TemplateGenerator.run(
+          template_name: (args.first || ""),
+          current_path:  `pwd`.chomp,
+          local_path:    options_hash.delete(:path),
+          locals:        options_hash
+        )
+      end
+    end
+
+    command :"gen.deps" do |c|
+      c.syntax = 'rdm gen.deps PACKAGE_NAME'
+      c.description = 'puts list of recursive dependencies for specified package'
+      c.summary = '> ' + c.description
+      c.example 'show dependencies for `commands` package', 'rdm gen.deps commands'
+
+      c.action do |args, options|
+        package_name = args.first || ""
+
+        Rdm::CLI::DependenciesController.run(
+          package_name: package_name,
+          project_path: `pwd`.chomp
+        )
+      end
+    end
 
     run!
   end

data/example/.rdm/helpers/render_helper.rb

@@ -0,0 +1,12 @@
+module Rdm
+  module RenderHelper
+    def camelize(string, uppercase_first_letter = true)
+      if uppercase_first_letter
+        string = string.sub(/^[a-z\d]*/) { $&.capitalize }
+      else
+        string = string.sub(/^(?:(?=\b|[A-Z_])|\w)/) { $&.downcase }
+      end
+      string.gsub(/(?:_|(\/))([a-z\d]*)/) { "#{$1}#{$2.capitalize}" }.gsub('/', '::')
+    end
+  end
+end

data/example/.rdm/templates/package/.gitignore

@@ -0,0 +1 @@
+

data/example/.rdm/templates/package/.rspec

@@ -0,0 +1,2 @@
+--color
+--require spec_helper

data/example/.rdm/templates/package/<%=package_subdir_name%>/<%=package_name%>.rb

@@ -0,0 +1,3 @@
+module <%= camelize(package_name) %>
+
+end

data/example/.rdm/templates/package/spec/spec_helper.rb

@@ -0,0 +1,10 @@
+ENV['RUBY_ENV'] = 'test'
+
+require 'rdm'
+Rdm.init(File.expand_path('../../', __FILE__), :test)
+
+require 'rspec'
+require 'byebug'
+
+RSpec.configure do |config|
+end

data/example/.rdm/templates/repository/dao/<%=name%>_dao.rb

@@ -0,0 +1,4 @@
+require '<%=name%>_repository'
+
+class <%= camelize(name) %>
+end

data/example/.rdm/templates/repository/mapper/<%=name%>_mapper.rb

@@ -0,0 +1,2 @@
+class <%= camelize(name) %>
+end

data/example/.rdm/templates/repository/repository/<%=name%>_repository.rb

@@ -0,0 +1,2 @@
+class <%= camelize(name) %>
+end

data/example/.rdm/templates/repository/views/users.html.erb

@@ -0,0 +1,2 @@
+class <%=name%>
+end

data/example/Gemfile.lock

@@ -0,0 +1,50 @@
+PATH
+  remote: ..
+  specs:
+    rdm (0.2.0)
+      activesupport
+      commander (~> 4.4)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (5.1.2)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    commander (4.4.3)
+      highline (~> 1.7.2)
+    concurrent-ruby (1.0.5)
+    diff-lcs (1.3)
+    highline (1.7.8)
+    i18n (0.8.4)
+    minitest (5.10.2)
+    rspec (3.6.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.6.0)
+    rspec-mocks (3.6.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
+    sequel (4.48.0)
+    thread_safe (0.3.6)
+    tzinfo (1.2.3)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  rdm!
+  rspec
+  sequel
+
+BUNDLED WITH
+   1.15.1

data/example/Rdm.packages

@@ -4,6 +4,7 @@ setup do
   config_path ":configs_dir/:config_name/default.yml"
   role_config_path ":configs_dir/:config_name/:role.yml"
   package_subdir_name "package"
+  compile_path "/tmp/rdm_compiled"
 end
 
 config :database

data/lib/rdm.rb

@@ -3,17 +3,18 @@ module Rdm
   PACKAGE_FILENAME = 'Package.rb'.freeze
 
   # Utils
-  require 'rdm/support/colorize'
-  require 'rdm/support/render'
-  require 'rdm/support/template'
+  require 'rdm/utils/render_util'
+  require 'rdm/utils/string_utils'
+  require 'rdm/utils/file_utils'
   require 'rdm/version'
 
   # CLI part
   require 'rdm/cli/gen_package'
+  require 'rdm/cli/compile_package'
   require 'rdm/cli/init'
-  require 'rdm/gen/concerns/template_handling'
-  require 'rdm/gen/package'
-  require 'rdm/gen/init'
+  require 'rdm/cli/diff_package'
+  require 'rdm/cli/template_generator'
+  require 'rdm/cli/dependencies_controller'
 
   # Runtime part
   require 'rdm/config'
@@ -27,10 +28,41 @@ module Rdm
   require 'rdm/source'
   require 'rdm/source_parser'
   require 'rdm/source_locator'
+  require 'rdm/git/diff_manager'
+  require 'rdm/git/diff_command'
+  require 'rdm/git/repository_locator'
+
+  # Package part
+  require 'rdm/packages/compiler_service'
+  require 'rdm/packages/locator'
+
+  # Handlers part
+  require 'rdm/gen/package'
+  require 'rdm/gen/init'
+  require 'rdm/handlers/diff_package_handler'
+  require 'rdm/handlers/template_handler'
+  require 'rdm/handlers/dependencies_handler'
+
+  require 'rdm/helpers/path_helper'
+
+  require 'rdm/templates/template_renderer'
+  require 'rdm/templates/template_detector'
+
+  # Spec runner
+  require 'rdm/spec_runner'
+  require 'rdm/spec_runner/command_generator'
+  require 'rdm/spec_runner/command_params'
+  require 'rdm/spec_runner/package_fetcher'
+  require 'rdm/spec_runner/runner'
+  require 'rdm/spec_runner/view'
+
+  extend Rdm::Helpers::PathHelper
 
   class << self
     # Initialize current package using Package.rb
-    def init(package_path, group = nil)
+    def init(package_path, group = nil, stdout: $stdout)
+      @stdout = stdout
+      
       Rdm::PackageImporter.import_file(package_path, group: group)
     end
 
@@ -51,7 +83,7 @@ module Rdm
 
     def root=(value)
       if @root && @root != value
-        puts "Rdm has already been initialized and Rdm.root was set to #{@root}"
+        @stdout.puts "Rdm has already been initialized and Rdm.root was set to #{@root}"
       end
       @root = value
     end

data/lib/rdm/cli/compile_package.rb

@@ -0,0 +1,56 @@
+module Rdm
+  module CLI
+    class CompilePackage
+      YES = 'y'
+
+      class << self
+        def compile(opts = {})
+          Rdm::CLI::CompilePackage.new(opts).compile
+        end
+      end
+
+      def initialize(package_name:, project_path:, compile_path: nil, overwrite_directory: nil)
+        @package_name        = package_name
+        @project_path        = project_path
+        @compile_path        = compile_path
+        @overwrite_directory = overwrite_directory
+      end
+
+      def compile
+        Rdm::SourceParser.read_and_init_source(Rdm::SourceLocator.locate(@project_path))
+
+        @overwrite_directory ||= ->() { STDIN.gets.chomp.downcase == YES }
+        @compile_path        ||= Rdm.settings.compile_path
+
+        if @package_name.blank?
+          puts 'Package name was not specified. Ex: rdm compile.package PACKAGE_NAME'
+          return
+        end
+
+        if @compile_path.blank?
+          puts 'Destination path was not specified. Ex: rdm compile.package package_name --path FOLDER_PATH'
+          return
+        end
+
+        if Dir.exists?(@compile_path)
+          puts "Destination directory exists. Overwrite it? (y/n)"
+          return unless @overwrite_directory.call
+        end
+
+        compiled_packages = Rdm::Packages::CompilerService.compile(
+          package_name: @package_name,
+          project_path: @project_path,
+          compile_path: @compile_path
+        )
+
+        puts <<~EOF
+          The following packages were copied:
+          #{compiled_packages.map(&:capitalize).join("\n")}
+        EOF
+
+      rescue Rdm::Errors::SourceFileDoesNotExist => e
+        puts "Rdm.packages was not found. Run 'rdm init' to create it"
+      end
+    end
+  end
+end