meta_commit 0.1.0.alpha → 0.2.0.pre.alpha

data/lib/meta_commit/models/diffs/diff.rb

@@ -1,4 +1,14 @@
 module MetaCommit::Models::Diffs
+  # Base class for diffs
+  # @attr [Symbol] diff_type
+  # @attr [String] commit_old
+  # @attr [String] commit_new
+  # @attr [String] old_file
+  # @attr [String] new_file
+  # @attr [String] old_lineno
+  # @attr [String] new_lineno
+  # @attr [MetaCommit::Models::ContextualAstNode] old_ast_path
+  # @attr [MetaCommit::Models::ContextualAstNode] new_ast_path
   class Diff
 
     TYPE_ADDITION = :addition
@@ -11,24 +21,42 @@ module MetaCommit::Models::Diffs
     attr_accessor :old_lineno, :new_lineno
     attr_accessor :old_ast_path, :new_ast_path
 
+    # @return [String]
     def inspect
       string_representation
     end
 
+    # @return [String]
     def to_s
       string_representation
     end
 
+    # @return [String]
     def string_representation
       "#{diff_type} was performed"
     end
 
-    def supports_change_of_type(type)
+    # @param [Symbol] type
+    # @param [String] old_file_name
+    # @param [String] new_file_name
+    # @param [String] old_ast_path
+    # @param [String] new_ast_path
+    # @return [Boolean]
+    def supports_change(type, old_file_name, new_file_name, old_ast_path, new_ast_path)
       true
     end
 
-    def supports_change(type, old_file_name, new_file_name, old_ast_path, new_ast_path)
-      true
+    # @return [Boolean]
+    def type_addition?
+      @diff_type == TYPE_ADDITION
+    end
+    # @return [Boolean]
+    def type_deletion?
+      @diff_type == TYPE_DELETION
+    end
+    # @return [Boolean]
+    def type_replace?
+      @diff_type == TYPE_REPLACE
     end
   end
 end

data/lib/meta_commit/services/change_saver.rb

@@ -1,14 +1,10 @@
 module MetaCommit::Services
   class ChangeSaver
-    attr_accessor :repo
+    attr_accessor :repo, :meta_adapter
 
-    def initialize(repo)
+    def initialize(repo, meta_adapter)
       @repo = repo
-    end
-
-    def meta_adapter
-      # @TODO fetch adapter from config
-      MetaCommit::Adapters::GitNotes.new(@repo.repo.path)
+      @meta_adapter = meta_adapter
     end
 
     def store_meta(changes_of_repo)
@@ -18,24 +14,5 @@ module MetaCommit::Services
     def store_repository_changes(changes_of_repo)
       meta_adapter.write_repository_change_chunk(repo, changes_of_repo)
     end
-
-    def store_commit_changes(changes_of_commit)
-      meta_adapter.write_commit_change_chunk(repo.repo, changes_of_repo, changes_of_commit)
-      changes_of_commit.each do |changes_of_file|
-        store_file_changes(changes_of_file)
-      end
-    end
-
-    def store_file_changes(changes_of_file)
-      meta_adapter.write_file_change_chunk(changes_of_file)
-      uniques_file_changes = changes_of_file.changes.uniq { |diff| diff.to_s }
-      uniques_file_changes.each do |diff|
-        store_diff(diff)
-      end
-    end
-
-    def store_diff(diff)
-      meta_adapter.write_diff(diff)
-    end
   end
 end

data/lib/meta_commit/services/parse.rb

@@ -0,0 +1,21 @@
+module MetaCommit::Services
+  # Parse service responsibility is to parse text if matched parser found and return parsed content
+  class Parse
+    # @param [MetaCommit::Factories::ParserFactory] factory
+    def initialize(factory)
+      @factory=factory
+    end
+
+    # Parses content and if matched parser found returns parsed content
+    # @param [String] filename
+    # @param [String] content
+    # @return [MetaCommit::Contracts::Ast, nil]
+    def execute(filename, content)
+      parser = @factory.create_parser_for(filename, content)
+      return nil if parser.nil?
+      ast = parser.parse(content)
+      ast.parser_class = parser.class
+      ast
+    end
+  end
+end

data/lib/meta_commit/version.rb

@@ -1,3 +1,3 @@
 module MetaCommit
-  VERSION = "0.1.0.alpha"
+  VERSION = "0.2.0.pre.alpha"
 end

data/lib/meta_commit.rb

@@ -1,35 +1,42 @@
-require "meta_commit/version"
+module MetaCommit
+  module Extension
+  end
 
-require "meta_commit/cli"
-require "meta_commit/git/repo"
+  require "meta_commit/version"
+  require "meta_commit_contracts"
+  require "meta_commit/errors"
+  require "meta_commit/configuration"
+  require "meta_commit/configuration_store"
+  require "meta_commit/container"
+  require "meta_commit/cli"
 
-require "meta_commit/adapters/dump"
-require "meta_commit/adapters/git_notes"
+  # changelog command
+  require "meta_commit/changelog/adapters/changelog"
+  require "meta_commit/changelog/commands/commit_diff_examiner"
+  require "meta_commit/changelog/formatters/keep_a_changelog_ver_report_builder"
 
-require "meta_commit/models/ast_path"
-require "meta_commit/models/line"
-require "meta_commit/models/changes/commit"
-require "meta_commit/models/changes/file"
-require "meta_commit/models/changes/repository"
+  # message command
+  require "meta_commit/message/commands/diff_index_examiner"
+  require "meta_commit/message/formatters/commit_message_builder"
 
-require "meta_commit/models/diffs/diff"
-require "meta_commit/models/diffs/class_creation"
-require "meta_commit/models/diffs/class_deletion"
-require "meta_commit/models/diffs/class_rename"
-require "meta_commit/models/diffs/method_creation"
-require "meta_commit/models/diffs/method_deletion"
-require "meta_commit/models/diffs/changes_in_method"
-require "meta_commit/models/diffs/module_creation"
-require "meta_commit/models/diffs/module_deletion"
-require "meta_commit/models/diffs/module_rename"
+  # index command
+  require "meta_commit/index/commands/diff_examiner"
+  require "meta_commit/index/adapters/git_notes"
 
-require "meta_commit/models/factories/diff_factory"
-require "meta_commit/models/factories/ast_path_factory"
+  # models
+  require "meta_commit/models/contextual_ast_node"
+  require "meta_commit/models/line"
+  require "meta_commit/models/changes/commit"
+  require "meta_commit/models/changes/repository"
+  require "meta_commit/models/diffs/diff"
 
-require "meta_commit/services/diff_examiner"
-require "meta_commit/services/diff_index_examiner"
-require "meta_commit/services/change_saver"
-require "meta_commit/services/commit_message_builder"
+  # factories
+  require "meta_commit/factories/diff_factory"
+  require "meta_commit/factories/contextual_ast_node_factory"
+  require "meta_commit/factories/parser_factory"
 
-module MetaCommit
+  # services
+  require "meta_commit/services/change_saver"
+  require "meta_commit/services/parse"
+  require "meta_commit/git/repo"
 end

data/meta_commit.gemspec

@@ -18,13 +18,18 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.add_runtime_dependency "meta_commit_contracts", "~> 0.1.0"
   spec.add_runtime_dependency "rugged", "~> 0.25"
+  spec.add_runtime_dependency "dry-container", "~> 0.6.0"
   spec.add_runtime_dependency "parser", "~> 2.4"
   spec.add_runtime_dependency "thor", "~> 0.19"
 
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.6"
+  spec.add_development_dependency "cucumber", "~> 2.4.0"
+  spec.add_development_dependency "aruba", "~> 0.14.2"
   spec.add_development_dependency "rspec-mocks", "~> 3.6"
   spec.add_development_dependency "byebug", "~> 9.0"
+  spec.add_development_dependency "coveralls", "~> 0.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: meta_commit
 version: !ruby/object:Gem::Version
-  version: 0.1.0.alpha
+  version: 0.2.0.pre.alpha
 platform: ruby
 authors:
 - Stanislav Dobrovolskiy
@@ -9,8 +9,22 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-18 00:00:00.000000000 Z
+date: 2017-10-17 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: meta_commit_contracts
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: rugged
   requirement: !ruby/object:Gem::Requirement
@@ -25,6 +39,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.25'
+- !ruby/object:Gem::Dependency
+  name: dry-container
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: parser
   requirement: !ruby/object:Gem::Requirement
@@ -95,6 +123,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.6'
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.0
+- !ruby/object:Gem::Dependency
+  name: aruba
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.14.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.14.2
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
@@ -123,6 +179,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '9.0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
 description: 
 email:
 - uusername@protonmail.ch
@@ -135,42 +205,39 @@ files:
 - ".gitignore"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
+- CONTRIBUTING.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/console
 - bin/setup
+- config/default.yml
 - exe/meta_commit
 - lib/meta_commit.rb
-- lib/meta_commit/adapters/dump.rb
-- lib/meta_commit/adapters/git_notes.rb
+- lib/meta_commit/changelog/adapters/changelog.rb
+- lib/meta_commit/changelog/commands/commit_diff_examiner.rb
+- lib/meta_commit/changelog/formatters/keep_a_changelog_ver_report_builder.rb
 - lib/meta_commit/cli.rb
+- lib/meta_commit/configuration.rb
+- lib/meta_commit/configuration_store.rb
+- lib/meta_commit/container.rb
+- lib/meta_commit/errors.rb
+- lib/meta_commit/factories/contextual_ast_node_factory.rb
+- lib/meta_commit/factories/diff_factory.rb
+- lib/meta_commit/factories/parser_factory.rb
 - lib/meta_commit/git/repo.rb
-- lib/meta_commit/models/ast_path.rb
+- lib/meta_commit/index/adapters/git_notes.rb
+- lib/meta_commit/index/commands/diff_examiner.rb
+- lib/meta_commit/message/commands/diff_index_examiner.rb
+- lib/meta_commit/message/formatters/commit_message_builder.rb
 - lib/meta_commit/models/changes/commit.rb
-- lib/meta_commit/models/changes/file.rb
 - lib/meta_commit/models/changes/repository.rb
-- lib/meta_commit/models/diffs/addition.rb
-- lib/meta_commit/models/diffs/changes_in_method.rb
-- lib/meta_commit/models/diffs/class_creation.rb
-- lib/meta_commit/models/diffs/class_deletion.rb
-- lib/meta_commit/models/diffs/class_rename.rb
-- lib/meta_commit/models/diffs/deletion.rb
+- lib/meta_commit/models/contextual_ast_node.rb
 - lib/meta_commit/models/diffs/diff.rb
-- lib/meta_commit/models/diffs/method_creation.rb
-- lib/meta_commit/models/diffs/method_deletion.rb
-- lib/meta_commit/models/diffs/module_creation.rb
-- lib/meta_commit/models/diffs/module_deletion.rb
-- lib/meta_commit/models/diffs/module_rename.rb
-- lib/meta_commit/models/diffs/replacement.rb
-- lib/meta_commit/models/factories/ast_path_factory.rb
-- lib/meta_commit/models/factories/diff_factory.rb
 - lib/meta_commit/models/line.rb
 - lib/meta_commit/services/change_saver.rb
-- lib/meta_commit/services/commit_message_builder.rb
-- lib/meta_commit/services/diff_examiner.rb
-- lib/meta_commit/services/diff_index_examiner.rb
+- lib/meta_commit/services/parse.rb
 - lib/meta_commit/version.rb
 - meta_commit.gemspec
 homepage: https://github.com/usernam3/meta_commit

data/lib/meta_commit/adapters/dump.rb

@@ -1,31 +0,0 @@
-module MetaCommit::Adapters
-  class Dump
-    attr_accessor :repository, :commit, :file
-
-    def initialize
-
-    end
-
-    def write_repository_change_chunk(repository_change)
-      puts '---'
-      puts "repo id: #{repository_change.repo_id}"
-      puts '---'
-    end
-
-    def write_commit_change_chunk(commit_change)
-      puts "> commit : #{commit_change.commit_id}"
-    end
-
-    def write_file_change_chunk(file_change)
-      puts "file : #{file_change.file_path}"
-    end
-
-    def write_diff(diff)
-      puts " - #{diff}"
-    end
-
-    def write_lines
-
-    end
-  end
-end

data/lib/meta_commit/adapters/git_notes.rb

@@ -1,28 +0,0 @@
-module MetaCommit::Adapters
-  class GitNotes
-    attr_accessor :repository, :commit, :file
-
-    def initialize(repository)
-      @repository = repository
-    end
-
-    def write_repository_change_chunk(repository, repository_changes)
-      repository_changes.each do |commit_changes|
-        diffs=[]
-        commit_changes.each do |file_changes|
-          uniques_file_changes = file_changes.changes.uniq { |diff| diff.to_s }
-          uniques_file_changes.each do |diff|
-            diffs.push(" - #{diff.string_representation}")
-          end
-        end
-        write_to_notes(repository.path, commit_changes.new_commit_id, diffs.join("\n"))
-      end
-    end
-
-    def write_to_notes(repo_path, commit_id, message)
-      # @TODO escape command
-      # @TODO add --ref=meta_commit
-      system("git --git-dir '#{repo_path}' notes add -f -m '#{message}' #{commit_id}")
-    end
-  end
-end

data/lib/meta_commit/models/ast_path.rb

@@ -1,111 +0,0 @@
-module MetaCommit::Models
-  class AstPath
-    attr_accessor :ast, :path
-
-    # region helpers
-    def is_module_definition?(node)
-      node.type == :module
-    end
-
-    def is_class_definition?(node)
-      node.type == :class
-    end
-
-    def is_method_definition?(node)
-      node.type == :def
-    end
-
-    def extract_module_name(node)
-      node.children.first.children.last.to_s
-    end
-
-    def extract_class_name(node)
-      node.children.first.children.last.to_s
-    end
-
-    def extract_method_name(node)
-      node.children.first.to_s
-    end
-
-    def empty_ast?
-      @ast.nil?
-    end
-
-    # endregion
-
-    # region external helpers
-    def is_module?
-      @ast.type == :module
-    end
-
-    def is_class?
-      @ast.type == :class
-    end
-
-    def is_method?
-      @ast.type == :def
-    end
-
-    # on created class only first line goes to diff
-    def is_name_of_class?
-      (@ast.type == :const) and (@path.length > 1) and (@path[@path.length - 1 - 1].type == :class)
-    end
-
-    # on created module only first line goes to diff
-    def is_name_of_module?
-      (@ast.type == :const) and (@path.length > 1) and (@path[@path.length - 1 - 1].type == :module)
-    end
-
-    def module_name
-      @ast.children.first.children.last.to_s
-    end
-
-    def class_name
-      @ast.children.first.children.last.to_s
-    end
-
-    def method_name
-      @ast.children.first.to_s
-    end
-
-    def name_of_context_module
-      @path.reverse.each do |parent|
-        return extract_module_name(parent) if is_module_definition?(parent)
-      end
-    end
-
-    def name_of_context_class
-      @path.reverse.each do |parent|
-        return extract_class_name(parent) if is_class_definition?(parent)
-      end
-    end
-
-    def name_of_context_method
-      @path.reverse.each do |parent|
-        return extract_method_name(parent) if is_method_definition?(parent)
-      end
-    end
-
-    def is_in_context_of_module?
-      @path.each do |parent|
-        return true if is_module_definition?(parent)
-      end
-      false
-    end
-
-    def is_in_context_of_class?
-      @path.each do |parent|
-        return true if is_class_definition?(parent)
-      end
-      false
-    end
-
-    def is_in_context_of_method?
-      @path.each do |parent|
-        return true if is_method_definition?(parent)
-      end
-      false
-    end
-    # endregion
-  end
-end

data/lib/meta_commit/models/changes/file.rb

@@ -1,27 +0,0 @@
-module MetaCommit::Models::Changes
-  class File
-    attr_accessor :old_file_path, :new_file_path, :changes
-
-    def initialize(old_file_path, new_file_path)
-      @old_file_path = old_file_path
-      @new_file_path = new_file_path
-      @changes = []
-    end
-
-    def push(change)
-      @changes.push(change)
-    end
-
-    def file_path
-      if @new_file_path == @new_file_path
-        @new_file_path
-      else
-        "#{@old_file_path} -> #{@new_file_path}"
-      end
-    end
-
-    def each(&block)
-      @changes.each(&block)
-    end
-  end
-end

data/lib/meta_commit/models/diffs/addition.rb

@@ -1,34 +0,0 @@
-module MetaCommit::Models::Diffs
-  class Addition < Diff
-    def string_representation
-      action = 'created'
-      if @new_ast_path.is_class?
-        if @new_ast_path.is_in_context_of_module?
-          return "#{action} #{new_ast_path.name_of_context_module}::#{new_ast_path.class_name}"
-        end
-        return "#{action} class #{new_ast_path.class_name}"
-      end
-      if @new_ast_path.is_name_of_class?
-        if @new_ast_path.is_in_context_of_module?
-          return "#{action} #{new_ast_path.name_of_context_module}::#{new_ast_path.name_of_context_class}"
-        end
-        return "#{action} class #{new_ast_path.name_of_context_class}"
-      end
-      if @new_ast_path.is_method?
-        if @new_ast_path.is_in_context_of_class?
-          return "#{action} #{new_ast_path.name_of_context_class}##{new_ast_path.method_name}"
-        end
-        if @new_ast_path.is_in_context_of_module?
-          if @new_ast_path.is_in_context_of_class?
-            return "#{action} #{new_ast_path.name_of_context_module}::#{new_ast_path.name_of_context_class}##{new_ast_path.method_name}"
-          end
-          return "#{action} #{new_ast_path.name_of_context_module}##{new_ast_path.method_name}"
-        end
-      end
-      if @new_ast_path.is_in_context_of_method?
-        return "changes in method #{@new_ast_path.name_of_context_method}"
-      end
-      'addition was performed'
-    end
-  end
-end

data/lib/meta_commit/models/diffs/changes_in_method.rb

@@ -1,14 +0,0 @@
-module MetaCommit::Models::Diffs
-  class ChangesInMethod < Diff
-    def supports_change(type, old_file_name, new_file_name, old_ast_path, new_ast_path)
-      type == MetaCommit::Models::Diffs::Diff::TYPE_REPLACE && !old_ast_path.empty_ast? && !new_ast_path.empty_ast? && old_ast_path.is_in_context_of_method? && new_ast_path.is_in_context_of_method?
-    end
-
-    def string_representation
-      if @new_ast_path.is_in_context_of_class?
-        return "changes in #{new_ast_path.name_of_context_class}##{new_ast_path.name_of_context_method}"
-      end
-      "changes in ##{new_ast_path.name_of_context_method}"
-    end
-  end
-end

data/lib/meta_commit/models/diffs/class_creation.rb

@@ -1,20 +0,0 @@
-module MetaCommit::Models::Diffs
-  class ClassCreation < Diff
-    def supports_change(type, old_file_name, new_file_name, old_ast_path, new_ast_path)
-      type == MetaCommit::Models::Diffs::Diff::TYPE_ADDITION && !new_ast_path.empty_ast? && (new_ast_path.is_class? || new_ast_path.is_name_of_class?)
-    end
-
-    def string_representation
-      if @new_ast_path.is_class?
-        if @new_ast_path.is_in_context_of_module?
-          return "created #{new_ast_path.name_of_context_module}::#{new_ast_path.class_name}"
-        end
-        return "created class #{new_ast_path.class_name}"
-      end
-      if @new_ast_path.is_in_context_of_module?
-        return "created #{new_ast_path.name_of_context_module}::#{new_ast_path.name_of_context_class}"
-      end
-      "created class #{new_ast_path.name_of_context_class}"
-    end
-  end
-end

data/lib/meta_commit/models/diffs/class_deletion.rb

@@ -1,16 +0,0 @@
-module MetaCommit::Models::Diffs
-  class ClassDeletion < Diff
-    def supports_change(type, old_file_name, new_file_name, old_ast_path, new_ast_path)
-      type == MetaCommit::Models::Diffs::Diff::TYPE_DELETION && !old_ast_path.empty_ast? && (old_ast_path.is_class? || old_ast_path.is_name_of_class?)
-    end
-
-    def string_representation
-      if @old_ast_path.is_class?
-        if @old_ast_path.is_in_context_of_module?
-          return "removed class #{old_ast_path.class_name} from module #{old_ast_path.name_of_context_module}"
-        end
-      end
-      "removed class #{old_ast_path.name_of_context_class}"
-    end
-  end
-end