git-dust 0.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f7fcf266a880a58f3dcb6c42871e667e0afb6593
+  data.tar.gz: 8c28817a0858fbcb1828f8b8d6ff358d9d6aedb7
+SHA512:
+  metadata.gz: 27ee9eb62b8462d09e61f89a99021ff49b17f3b97344ac7b962395c8b18078d04b41bde2ce5886226ebeb14eb57427c10e414bfe88a0aede6d256468dcf8349e
+  data.tar.gz: c736a53616c8a45100197f9ea5d90c6bff08c5bdfad14eea1531e3820244d31f50ec699d3d04ecbb45892a6e6d20e2357da15ba6671aa2af2ffe2e213e393811

data/.gitignore

@@ -0,0 +1,18 @@
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp
+/.ruby-version

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - ruby-head
+  - 2.1
+  - 2.0.0

data/Gemfile

@@ -0,0 +1,10 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in git-dust.gemspec
+gemspec
+
+group :development, :test do
+  gem "coveralls", require: false
+  # test needs restoring environments feature.
+  gem "git", require: false, github: "nishidayuya/ruby-git", ref: "e803dd65b7a851431835f72052e09e445a80e532"
+end

data/Guardfile

@@ -0,0 +1,14 @@
+guard :bundler do
+  watch("Gemfile")
+  watch(/\A.+\.gemspec\z/)
+end
+
+guard :rspec, all_after_pass: true, all_on_start: true do
+  watch(%r{\Alib/(.+)\.rb\z}) { |m|
+    "spec/#{m[1]}_spec.rb"
+  }
+  watch("spec/spec_helper.rb") {
+    "spec"
+  }
+  watch(%r{\Aspec/.+_spec\.rb\z})
+end

data/LICENSE.txt

@@ -0,0 +1,22 @@
+Copyright (c) 2014 Yuya.Nishida.
+
+X11 License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -0,0 +1,44 @@
+# git dust
+
+A Git sub command for Dust Commits Workflow.
+
+ [![Build Status](https://travis-ci.org/nishidayuya/git-dust.svg?branch=master)](https://travis-ci.org/nishidayuya/git-dust)
+
+## Installation
+
+Depenedencies:
+* git
+* Ruby
+
+Install standalone version:
+```sh
+$ curl https://raw.githubusercontent.com/nishidayuya/git-dust/master/lib/git/dust.rb > path-environment-directory/git-dust
+$ chmod a+x path-environment-directory/git-dust
+```
+
+## Usage
+
+To create many dust commits and squash them:
+```sh
+$ git add foo.txt
+$ git dust commit
+<commit foo.txt with commit message "git dust commit.">
+$ git dust commit -a
+<commit modified files with commit message "git dust commit.">
+...
+$ git dust fix
+<squash dust commits and open editor to write commit message>
+```
+
+## News
+
+* 0.0.0: 2014-07-12 first release.
+  * "git dust commit" and "git dust fix".
+
+## Contributing
+
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request

data/Rakefile

@@ -0,0 +1,6 @@
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new
+
+task :default => :spec

data/bin/git-dust

@@ -0,0 +1,4 @@
+#! /usr/bin/env ruby
+
+require "git/dust"
+Git::Dust.run(ARGV)

data/git-dust.gemspec

@@ -0,0 +1,26 @@
+# coding: utf-8
+
+lib = File.join(__dir__, "lib")
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+
+Gem::Specification.new do |spec|
+  spec.name          = "git-dust"
+  spec.version       = "0.0.0"
+  spec.authors       = ["Yuya.Nishida."]
+  spec.email         = ["yuya@j96.org"]
+  spec.summary       = "A Git sub command for Dust Commits Workflow."
+  spec.homepage      = "https://github.com/nishidayuya/git-dust"
+  spec.license       = "X11"
+
+  spec.files         = `git ls-files`.split($/)
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
+
+  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "guard-bundler"
+  spec.add_development_dependency "guard-rspec"
+  spec.add_development_dependency "pry-byebug"
+end

data/lib/git/dust.rb

@@ -0,0 +1,103 @@
+#! /usr/bin/env ruby
+
+require "open3"
+require "pathname"
+
+# compatibility
+if !Pathname.public_method_defined?(:write)
+  class Pathname
+    def write(*args)
+      open("w") do |f|
+        f.write(*args)
+      end
+    end
+  end
+end
+
+module Git
+end
+
+class Git::Dust
+  def self.help(args = [])
+    STDERR.puts(<<EOS)
+#{File.basename($0)} <command> [<args>]
+
+git dust commands are:
+* commit
+EOS
+  end
+
+  def self.run(command_and_args)
+    command = command_and_args.first || "help"
+    command_symbol = command.gsub("-", "_").to_sym
+    args = command_and_args[1 .. -1]
+    defined_commands = public_methods(false) - %i(allocate new superclass run)
+    if defined_commands.include?(command_symbol)
+      send(command_symbol, args)
+    else
+      STDERR.puts("sub command not found: sub_command=<#{command}>")
+      STDERR.puts
+      help
+      exit(1)
+    end
+  end
+
+  def self.commit(args)
+    run_command(*%w(git commit -m), COMMIT_MESSAGE, *args)
+  end
+
+  def self.fix(args)
+    base_sha1 = find_non_dust_commit
+    saved_editor_environment = ENV["GIT_SEQUENCE_EDITOR"]
+    begin
+      ENV["GIT_SEQUENCE_EDITOR"] = "git dust edit-rebase-commit-list"
+      run_command(*%w(git rebase -i), base_sha1)
+    ensure
+      ENV["GIT_SEQUENCE_EDITOR"] = saved_editor_environment
+    end
+    run_command(*%w(git reset --soft HEAD^))
+    run_command("git commit --edit")
+  end
+
+  def self.edit_rebase_commit_list(args)
+    output = []
+    rebase_todo_path = Pathname(args.first)
+    rebase_todo_path.open do |f|
+      lines = f.each_line
+      lines.each do |l| # write first commit
+        if !/\A\s*#/.match(l)
+          output << l
+          break
+        end
+      end
+      lines.each do |l| # change "pick" to "fixup"
+        output << l.sub(/\Apick/, "fixup")
+      end
+    end
+    rebase_todo_path.write(output.join)
+  end
+
+  private
+
+  COMMIT_MESSAGE = "git dust commit.".freeze
+
+  def self.run_command(*args)
+    if !system(*args)
+      raise "failed: args=<#{args.inspect}>"
+    end
+  end
+
+  def self.find_non_dust_commit
+    Open3.popen2("git log --format=oneline") do |stdin, stdout, wait_thread|
+      stdout.each_line.each do |line|
+        sha1, subject = line.chomp.split(" ", 2)
+        return sha1 if COMMIT_MESSAGE != subject
+      end
+    end
+    raise "non dust commit is not exist."
+  end
+end
+
+if $0 == __FILE__
+  Git::Dust.run(ARGV)
+end

data/spec/git/dust_spec.rb

@@ -0,0 +1,104 @@
+require "spec_helper"
+
+RSpec.describe Git::Dust do
+  def chenv(environments = {})
+    if block_given?
+      saved = chenv(environments)
+      begin
+        yield
+      ensure
+        chenv(saved)
+      end
+    else
+      saved = {}
+      environments.each do |key, value|
+        key = key.to_s
+        saved[key] = ENV[key]
+        ENV[key] = value.to_s
+      end
+      return saved
+    end
+  end
+
+  let(:tmp_path) {
+    Pathname(Dir.mktmpdir)
+  }
+
+  let(:g) {
+    Git.init((tmp_path + "git_working_directory").to_s)
+  }
+
+  let(:file1_path) {
+    Pathname(g.dir.path) + "a.txt"
+  }
+
+  before(:each) do
+    g.config("user.name", "git-dust test user")
+    g.config("user.email", "anonymous@git-dust.example.org")
+
+    file1_path.write("1\n")
+    g.add(all: true)
+    g.commit("first import.")
+
+    # only staging
+    file1_path.write("2\n")
+    g.add(all: true)
+  end
+
+  after(:each) do
+    tmp_path.rmtree
+  end
+
+  describe ".commit" do
+    describe "empty args" do
+      it "commit staging files with commit message" do
+        g.chdir do
+          expect do
+            Git::Dust.commit([])
+          end.to change {g.log.count}.by(1)
+        end
+        expect(g.log.first.message).to eq("git dust commit.")
+      end
+    end
+  end
+
+  describe ".fix" do
+    describe "empty args" do
+      let(:git_editor_input_path) {
+        path = tmp_path + "editor_input"
+        path.write("nothing input.\n") # will be overridden
+        path
+      }
+
+      let(:git_editor_path) {
+        path = tmp_path + "editor"
+        path.write(<<EOS)
+#! /bin/sh
+
+file=$1
+cat $file > #{git_editor_input_path}
+echo "some commit message." > $file
+EOS
+        path.chmod(0755)
+        path
+      }
+
+      it "squash dust commits" do
+        g.chdir do
+          Git::Dust.commit([])
+          file1_path.write("3\n")
+          g.add(all: true)
+          Git::Dust.commit([])
+          chenv(PATH: [BIN_PATH, ENV["PATH"]].join(":"),
+                RUBYLIB: [LIB_PATH, ENV["RUBYLIB"]].join(":"),
+                GIT_EDITOR: git_editor_path) do
+            expect do
+              Git::Dust.fix([])
+            end.to change {g.log.count}.from(3).to(2)
+          end
+        end
+        expect(g.log.first.message).to eq("some commit message.")
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,12 @@
+require "tmpdir"
+require "pathname"
+require "git"
+
+require "coveralls"
+Coveralls.wear!
+
+require "git/dust"
+
+TOP_PATH = Pathname(__dir__).parent.expand_path
+BIN_PATH = TOP_PATH + "bin"
+LIB_PATH = TOP_PATH + "lib"

metadata

@@ -0,0 +1,143 @@
+--- !ruby/object:Gem::Specification
+name: git-dust
+version: !ruby/object:Gem::Version
+  version: 0.0.0
+platform: ruby
+authors:
+- Yuya.Nishida.
+autorequire: 
+bindir: bin
+cert_chain: []
+date: 2014-07-12 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rake
+  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: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: guard-bundler
+  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: guard-rspec
+  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: pry-byebug
+  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'
+description: 
+email:
+- yuya@j96.org
+executables:
+- git-dust
+extensions: []
+extra_rdoc_files: []
+files:
+- ".gitignore"
+- ".travis.yml"
+- Gemfile
+- Guardfile
+- LICENSE.txt
+- README.md
+- Rakefile
+- bin/git-dust
+- git-dust.gemspec
+- lib/git/dust.rb
+- spec/git/dust_spec.rb
+- spec/spec_helper.rb
+homepage: https://github.com/nishidayuya/git-dust
+licenses:
+- X11
+metadata: {}
+post_install_message: 
+rdoc_options: []
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements: []
+rubyforge_project: 
+rubygems_version: 2.2.2
+signing_key: 
+specification_version: 4
+summary: A Git sub command for Dust Commits Workflow.
+test_files:
+- spec/git/dust_spec.rb
+- spec/spec_helper.rb