story_branch-git_wrapper 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c5556a10e0136d08819f45667dba7cf25ea67d7509bf008adbd3e19ed570697
-  data.tar.gz: ca842c1d3ba70bd7fef91e56d6873b44231c8041038ceb0fc2672ade22effb61
+  metadata.gz: 3a76df6d72cd3bd6acb33a19807b92f4fea967bf1ad650909d6b30352522a92f
+  data.tar.gz: ece50978f9315af05f54702e446ea756a9461e7db633061e9c2be4690fab560b
 SHA512:
-  metadata.gz: 91c839908b1d4c3e03ec95fe1c10b89d1537d143429005d46d45ae1380ff329b4c6e655f60f2ea211a11693ebb16c33a0aceddec3ea673d2dcfcbc031ec46402
-  data.tar.gz: 106841372f11a88b4e1fa2369762455103b9456e2e7f02ccf1194be7ae53be8f1f01fca5a2a5ef34859a6ec44b50d61a24ce0c4d0cddea4beb4138bc1c27d2d7
+  metadata.gz: 7345c2b4ebf37683c30ce51daf591ffb2d05896d44c95393456e7aa099b9789c9beb1be47c4a046bb927c3644551ca27112bd0c73800ec412725e27509be2a81
+  data.tar.gz: fa4867fc1018767800172b1335db0ee7370b622d6505576f7ffb99b3346be7b52e5847e0a8d1004a12b6f967ab52ea4efb9a4b9394b7978275116c83b5410425

data/.github/workflows/standard.yml

@@ -0,0 +1,13 @@
+name: StandardRB
+
+on: [push]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+    - name: StandardRB Linter
+      uses: andrewmcodes/standardrb-action@v1.0.0
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

data/.github/workflows/tests.yml

@@ -0,0 +1,19 @@
+name: CI
+
+on: [push]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.7
+          bundler-cache: true
+
+      - name: Run tests
+        run: bundle exec rake test

data/.gitignore

@@ -6,3 +6,5 @@
 /pkg/
 /spec/reports/
 /tmp/
+.byebug_history
+*.gem

data/Gemfile.lock

@@ -0,0 +1,58 @@
+PATH
+  remote: .
+  specs:
+    story_branch-git_wrapper (0.0.3)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    ansi (1.5.0)
+    ast (2.4.2)
+    builder (3.2.4)
+    json (2.6.2)
+    minitest (5.16.2)
+    minitest-reporters (1.5.0)
+      ansi
+      builder
+      minitest (>= 5.0)
+      ruby-progressbar
+    parallel (1.22.1)
+    parser (3.1.2.1)
+      ast (~> 2.4.1)
+    rainbow (3.1.1)
+    rake (12.3.3)
+    regexp_parser (2.5.0)
+    rexml (3.2.5)
+    rubocop (1.33.0)
+      json (~> 2.3)
+      parallel (~> 1.10)
+      parser (>= 3.1.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.19.1, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.21.0)
+      parser (>= 3.1.1.0)
+    rubocop-performance (1.14.3)
+      rubocop (>= 1.7.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
+    ruby-progressbar (1.11.0)
+    standard (1.15.0)
+      rubocop (= 1.33.0)
+      rubocop-performance (= 1.14.3)
+    unicode-display_width (2.2.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  minitest (~> 5.0)
+  minitest-reporters (~> 1.5)
+  rake (~> 12.0)
+  standard (~> 1.15)
+  story_branch-git_wrapper!
+
+BUNDLED WITH
+   2.1.4

data/Rakefile

@@ -5,6 +5,7 @@ Rake::TestTask.new(:test) do |t|
   t.libs << "test"
   t.libs << "lib"
   t.test_files = FileList["test/**/*_test.rb"]
+  t.verbose = true
 end
 
-task :default => :test
+task default: :test

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require "bundler/setup"
-require "story_branch/git_wrapper"
+require "story_branch/git"
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.

data/lib/story_branch/git/version.rb

@@ -0,0 +1,5 @@
+module StoryBranch
+  module Git
+    VERSION = "0.0.3"
+  end
+end

data/lib/story_branch/git/wrapper.rb

@@ -0,0 +1,102 @@
+# frozen_string_literal: true
+
+module StoryBranch
+  module Git
+    class Error < StandardError; end
+
+    class Wrapper
+      STATI_MATCHERS = {
+        modified_rx: /^ M (.*)/,
+        untracked_rx: /^\?\? (.*)/,
+        staged_rx: /^M  (.*)/,
+        added_rx: /^A  (.*)/
+      }.freeze
+
+      def self.command(cmd, opts = [])
+        gw = new
+        gw.execute(cmd, opts)
+      end
+
+      def self.command_lines(cmd, opts = [])
+        result = command(cmd, opts)
+        lines = result.split("\n")
+        lines.each(&:strip!)
+      end
+
+      def self.branch_names
+        # NOTE: Regex matcher for cases as:
+        # remotes/origin/allow.... <- remote branch (remove 'remotes/origin')
+        # * allow.... <- * indicates current branch (remove '* ')
+        # allow <- local branch (do nothing)
+        regex = %r{(^remotes/.*/|\s|[*])}
+        all_branches.map do |line|
+          line = line.sub(regex, "")
+          line
+        end
+      end
+
+      def self.current_branch
+        current_branch_line = all_branches.detect do |line|
+          line.match(/\*/)
+        end
+        current_branch_line.tr("*", " ").strip
+      end
+
+      def self.all_branches
+        command_lines("branch", "-a")
+      end
+
+      def self.create_branch(name)
+        command("checkout", ["-b", name])
+      end
+
+      def self.status
+        g_status = command_lines("status", "-s")
+        return nil if g_status.empty?
+
+        {
+          modified: status_collect(g_status, STATI_MATCHERS[:modified_rx]),
+          untracked: status_collect(g_status, STATI_MATCHERS[:untracked_rx]),
+          added: status_collect(g_status, STATI_MATCHERS[:added_rx]),
+          staged: status_collect(g_status, STATI_MATCHERS[:staged_rx])
+        }
+      end
+
+      def self.status_collect(status, regex)
+        chosen_stati = status.select { |e| e.match(regex) }
+        chosen_stati.map { |e| e.match(regex)[1] }
+      end
+
+      def self.commit(message)
+        command("commit", ["-m", message])
+      end
+
+      def initialize
+        @system_git = "git"
+      end
+
+      def execute(cmd, opts = [])
+        opts = prepare_opts(opts)
+        git_cmd = "#{@system_git} #{cmd} #{opts}"
+
+        `#{git_cmd}`.chomp.strip
+      end
+
+      private
+
+      # NOTE: Taken from ruby git gem
+      def escape(str = "")
+        str = str.to_s
+        return "'#{str.gsub("\'", '\'"\'"\'')}'" if /mingw|mswin/.match?(RUBY_PLATFORM)
+
+        # Keeping the old escape format for windows users
+        escaped = str.gsub("\'", "\'\\\'\'")
+        %("#{escaped}")
+      end
+
+      def prepare_opts(opts = [])
+        [opts].flatten.map { |s| escape(s) }.join(" ")
+      end
+    end
+  end
+end

data/lib/story_branch/git.rb

@@ -0,0 +1,7 @@
+require_relative "git/version"
+require_relative "git/wrapper"
+
+module StoryBranch
+  module Git
+  end
+end

data/story_branch-git_wrapper.gemspec

@@ -1,14 +1,14 @@
-require_relative "lib/story_branch/git_wrapper/version"
+require_relative "lib/story_branch/git/version"
 
 Gem::Specification.new do |spec|
   spec.name = "story_branch-git_wrapper"
-  spec.version = StoryBranch::GitWrapper::VERSION
+  spec.version = StoryBranch::Git::VERSION
   spec.authors = ["Rui Baltazar"]
   spec.email = ["rui.p.baltazar@gmail.com"]
 
-  spec.summary = "GitWrapper to help running git commands with direct system calls"
+  spec.summary = "Git::Wrapper to help running git commands with direct system calls"
   spec.description = <<~DESCRIPTION
-    GitWrapper provides a series of commands that wrap actual git commands and processes the output
+    Git::Wrapper provides a series of commands that wrap actual git commands and processes the output
   DESCRIPTION
   spec.homepage = "https://github.com/story-branch/git_wrapper"
   spec.license = "MIT"
@@ -31,5 +31,7 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.add_development_dependency "minitest", "~> 5.16"
+  spec.add_development_dependency "minitest-reporters", "~> 1.5"
   spec.add_development_dependency "standard", "~> 1.15"
 end

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: story_branch-git_wrapper
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - Rui Baltazar
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-08-19 00:00:00.000000000 Z
+date: 2022-08-22 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.16'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.16'
+- !ruby/object:Gem::Dependency
+  name: minitest-reporters
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: standard
   requirement: !ruby/object:Gem::Requirement
@@ -24,7 +52,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.15'
-description: 'GitWrapper provides a series of commands that wrap actual git commands
+description: 'Git::Wrapper provides a series of commands that wrap actual git commands
   and processes the output
 
 '
@@ -34,18 +62,22 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/standard.yml"
+- ".github/workflows/tests.yml"
 - ".gitignore"
 - ".travis.yml"
 - ".vscode/settings.json"
 - CODE_OF_CONDUCT.md
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/console
 - bin/setup
-- lib/story_branch/git_wrapper.rb
-- lib/story_branch/git_wrapper/version.rb
+- lib/story_branch/git.rb
+- lib/story_branch/git/version.rb
+- lib/story_branch/git/wrapper.rb
 - story_branch-git_wrapper.gemspec
 homepage: https://github.com/story-branch/git_wrapper
 licenses:
@@ -74,5 +106,5 @@ requirements: []
 rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
-summary: GitWrapper to help running git commands with direct system calls
+summary: Git::Wrapper to help running git commands with direct system calls
 test_files: []

data/lib/story_branch/git_wrapper/version.rb

@@ -1,5 +0,0 @@
-module StoryBranch
-  module GitWrapper
-    VERSION = "0.0.1"
-  end
-end

data/lib/story_branch/git_wrapper.rb

@@ -1,99 +0,0 @@
-require "story_branch/git_wrapper/version"
-
-module StoryBranch
-  module GitWrapper
-    class Error < StandardError; end
-
-    STATI_MATCHERS = {
-      modified_rx: /^ M (.*)/,
-      untracked_rx: /^\?\? (.*)/,
-      staged_rx: /^M  (.*)/,
-      added_rx: /^A  (.*)/
-    }.freeze
-
-    def self.command(cmd, opts = [])
-      gw = new
-      gw.call(cmd, opts)
-    end
-
-    def self.command_lines(cmd, opts = [])
-      result = command(cmd, opts)
-      lines = result.split("\n")
-      lines.each(&:strip!)
-    end
-
-    def self.branch_names
-      # NOTE: Regex matcher for cases as:
-      # remotes/origin/allow.... <- remote branch (remove 'remotes/origin')
-      # * allow.... <- * indicates current branch (remove '* ')
-      # allow <- local branch (do nothing)
-      regex = %r{(^remotes/.*/|\s|[*])}
-      all_branches.map do |line|
-        line = line.sub(regex, "")
-        line
-      end
-    end
-
-    def self.current_branch
-      current_branch_line = all_branches.detect do |line|
-        line.match(/\*/)
-      end
-      current_branch_line.tr("*", " ").strip
-    end
-
-    def self.all_branches
-      command_lines("branch", "-a")
-    end
-
-    def self.create_branch(name)
-      command("checkout", ["-b", name])
-    end
-
-    def self.status
-      g_status = command_lines("status", "-s")
-      return nil if g_status.empty?
-
-      {
-        modified: status_collect(g_status, STATI_MATCHERS[:modified_rx]),
-        untracked: status_collect(g_status, STATI_MATCHERS[:untracked_rx]),
-        added: status_collect(g_status, STATI_MATCHERS[:added_rx]),
-        staged: status_collect(g_status, STATI_MATCHERS[:staged_rx])
-      }
-    end
-
-    def self.status_collect(status, regex)
-      chosen_stati = status.select { |e| e.match(regex) }
-      chosen_stati.map { |e| e.match(regex)[1] }
-    end
-
-    def self.commit(message)
-      command("commit", ["-m", message])
-    end
-
-    def initialize
-      @system_git = "git"
-    end
-
-    def call(cmd, opts = [])
-      opts = prepare_opts(opts)
-      git_cmd = "#{@system_git} #{cmd} #{opts}"
-      `#{git_cmd}`.chomp.strip
-    end
-
-    private
-
-    # NOTE: Taken from ruby git gem
-    def escape(str = "")
-      str = str.to_s
-      return "'#{str.gsub("\'", '\'"\'"\'')}'" if /mingw|mswin/.match?(RUBY_PLATFORM)
-
-      # Keeping the old escape format for windows users
-      escaped = str.gsub("\'", "\'\\\'\'")
-      %("#{escaped}")
-    end
-
-    def prepare_opts(opts = [])
-      [opts].flatten.map { |s| escape(s) }.join(" ")
-    end
-  end
-end