git-si 0.0.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f5c033e4e7de28be2feb823ec8f1d32db17796b7
+  data.tar.gz: cb102435c9881c6614b06c20a27a67911de50186
+SHA512:
+  metadata.gz: ad49417b382b982f453ee176e7e54acd424c7fe2a39ac19c208e0ca74634c2ae3d1b93c4cc34715efda4918eb70669f1d155495cfc1c6422c9817073d87ff244
+  data.tar.gz: d5c427755fd6df789324d55e22e37eea8ac2633338c6c63340986a781eae4eb93496f0ce1f0dd422fb6b2d31d8e76bd8312c1a2c857d7bade152d0b4ace0bab9

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
+*.swp

data/Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in git-si.gemspec
+gemspec

data/LICENSE.txt

@@ -0,0 +1,22 @@
+Copyright (c) 2013 Payton Swick
+
+MIT 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,26 @@
+# Git::Si
+
+Git Svn Interface: a simple git extention to use git locally with a remote svn repo. It's like a simple version of git-svn which doesn't keep track of history locally.
+
+## Installation
+
+    $ gem install git-si
+
+## Usage
+
+    Commands:
+    git-si add [FILES]     # Perform an svn and a git add on the files.
+    git-si diff [FILES]    # Perform an svn diff piped through a colorizer. Also tests to be sure a rebase is not needed.
+    git-si fetch           # Updates mirror branch to latest svn commit.
+    git-si help [COMMAND]  # Describe available commands or one specific command
+    git-si pull            # Fetch the latest svn commit and rebase the current branch.
+    git-si rebase          # Rebases current branch to mirror branch.
+    git-si status [FILES]  # Perform an svn status.
+
+## 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 @@
+require "bundler/gem_tasks"

data/bin/git-si

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+
+$LOAD_PATH.unshift(File.dirname(__FILE__), '..', 'lib')
+require 'git/si'
+
+Git::Si::SvnInterface.start(ARGV)

data/git-si.gemspec

@@ -0,0 +1,28 @@
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'git/si/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = "git-si"
+  spec.version       = Git::Si::VERSION
+  spec.authors       = ["Payton Swick"]
+  spec.email         = ["payton@foolord.com"]
+  spec.description   = %q{Git Svn Interface: a simple git extention to use git locally with a remote svn repo.}
+  spec.summary       = %q{It's like a simple version of git-svn which doesn't keep track of history locally.}
+  spec.homepage      = ""
+  spec.license       = "MIT"
+
+  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 "thor"
+  spec.add_development_dependency "pager"
+
+  spec.add_runtime_dependency "thor"
+  spec.add_runtime_dependency "pager"
+end

data/lib/git/si/version.rb

@@ -0,0 +1,5 @@
+module Git
+  module Si
+    VERSION = "0.0.1"
+  end
+end

data/lib/git/si.rb

@@ -0,0 +1,291 @@
+require "git/si/version"
+require "thor"
+require "pager"
+
+module Git
+
+  module Si
+
+    class GitSiError < StandardError
+    end
+
+    class ShellError < GitSiError
+    end
+
+    class GitError < GitSiError
+    end
+
+    class SvnError < GitSiError
+    end
+
+    class VersionError < GitSiError
+    end
+
+    class SvnInterface < Thor
+      include Thor::Actions
+      include Pager
+
+      default_task :usage
+
+      @@mirror_branch = 'MIRRORBRANCH'
+
+      desc "usage", "How does this thing work?"
+      def usage
+        say "git-si
+
+Git Svn Interface: a simple git extention to use git locally with a remote svn
+repo. It's like a simple version of git-svn which doesn't keep track of history
+locally.
+
+Start with the init command to set up the mirror branch and from there you can
+use the commands below.
+
+"
+        help
+      end
+
+      desc "status [FILES]", "Perform an svn status."
+      def status(*args)
+        on_local_branch do
+          command = "svn status --ignore-externals " + args.join(' ')
+          svn_status = `#{command}`
+          raise SvnError.new("Failed to get the svn status. I'm not sure why. Check for any errors above.") if ! $?.success?
+          svn_status.each_line do |line|
+            case line.strip!
+            when /^X/, /\.git/, /\.swp$/
+            else
+              if STDOUT.tty?
+                print_colordiff line
+              else
+                say line
+              end
+            end
+          end
+        end
+      end
+
+      desc "diff [FILES]", "Perform an svn diff piped through a colorizer. Also tests to be sure a rebase is not needed."
+      def diff(*args)
+        on_local_branch do
+          last_fetched_version = get_svn_version()
+          git_log = `git log --pretty=%B`
+          results = git_log.match(/svn update to version (\d+)/i)
+          last_rebased_version = results[1] if results
+          if last_fetched_version and last_rebased_version
+            raise VersionError.new("This branch is out-of-date (rev #{last_rebased_version}; mirror branch is at #{last_fetched_version}). You should do a git si rebase.") if last_fetched_version != last_rebased_version
+          else
+            notice_message "Could not determine last version information. This may be fine if you haven't used git-si before."
+          end
+
+          command = "svn diff " + args.join(' ')
+          notice_message "Running #{command}"
+          results = `#{command}`
+          if STDOUT.tty?
+            page
+            print_colordiff results
+          else
+            say results
+          end
+        end
+      end
+
+      desc "add [FILES]", "Perform an svn and a git add on the files."
+      def add(*args)
+        on_local_branch do
+          command = "svn add " + args.join(' ')
+          run_command(command)
+          command = "git add " + args.join(' ')
+          run_command(command)
+        end
+      end
+
+      desc "fetch", "Updates mirror branch to latest svn commit."
+      def fetch
+        on_local_branch do
+          git_status = `git status --porcelain`
+          raise GitError.new("There are local changes; please commit them before continuing.") if git_status.match(/^[^\?]/)
+        end
+        on_mirror_branch do
+          notice_message "Fetching remote data from svn"
+          run_command("svn up --accept theirs-full --ignore-externals")
+          run_command("svn revert -R ./")
+          system("git add .")
+          run_command("git commit --allow-empty -am 'svn update to version #{get_svn_version}'")
+        end
+        success_message "fetch complete!"
+      end
+
+      desc "rebase", "Rebases current branch to mirror branch."
+      def rebase
+        on_local_branch do
+          run_command("git rebase '#{@@mirror_branch}'")
+          success_message "rebase complete!"
+        end
+      end
+
+      desc "pull", "Fetch the latest svn commit and rebase the current branch."
+      def pull
+        fetch
+        rebase
+      end
+
+      desc "commit", "Perform an svn commit and update the mirror branch."
+      def commit
+        on_local_branch do
+          run_command("svn commit")
+          success_message "commit complete!"
+          if yes? "Do you want to update the mirror branch to the latest commit? [y/N] "
+            on_mirror_branch do
+              fetch
+            end
+          end
+        end
+      end
+
+      desc "blame <FILE>", "Alias for svn blame."
+      def blame(*args)
+        on_local_branch do
+          command = "svn blame " + args.join(' ')
+          run_command(command)
+        end
+      end
+
+      desc "init", "Initializes git-si in this directory with a gitignore and creates a special mirror branch."
+      def init
+        on_local_branch do
+          # check for svn repo
+          `svn info`
+          raise SvnError.new("No svn repository was found here. Maybe you're in the wrong directory?") unless $?.success?
+          make_a_commit = false
+
+          # check for existing .git repo
+          if File.exist? '.git'
+            notice_message "Looks like a git repository already exists here."
+          else
+            notice_message "Initializing git repository"
+            `git init`
+            raise GitError.new("Failed to initialize git repository. I'm not sure why. Check for any errors above.") unless $?.success?
+            make_a_commit = true
+          end
+
+          # check for existing .gitingore
+          gitignore = [".svn", "*.swp", ".config", "*.err", "*.pid", "*.log"]
+          command = "svn status --ignore-externals "
+          svn_status = `#{command}`
+          raise SvnError.new("Failed to get the svn status. I'm not sure why. Check for any errors above.") if ! $?.success?
+          externals = []
+          svn_status.each_line do |line|
+            externals << $1 if line.strip.match(/^X\s+(\S.+)/)
+          end
+          gitignore += externals
+          gitignore = gitignore.join("\n")
+
+          if File.exist? '.gitignore'
+            notice_message "Looks like a gitignore file already exists here."
+            error_message "Be SURE that the gitignore contains the following:\n#{gitignore}"
+          else
+            notice_message "Creating gitignore file."
+            create_file('.gitignore', gitignore)
+            run_command("git add .gitignore")
+            make_a_commit = true
+          end
+
+          # make initial commit
+          if make_a_commit
+            notice_message "Making initial commit."
+            run_command("git add .")
+            run_command("git commit -am 'initial commit by git-si'")
+          end
+
+          # check for exiting mirror branch
+          `git show-ref refs/heads/#{@@mirror_branch}`
+          if $?.success?
+            notice_message "Looks like the mirror branch already exists here."
+          else
+            notice_message "Creating mirror branch '#{@@mirror_branch}'."
+            run_command("git branch '#{@@mirror_branch}'")
+          end
+
+          success_message "init complete!"
+        end
+      end
+
+
+      private
+
+      def get_svn_version
+        svn_info = `svn info`
+        results = svn_info.match(/^Revision:\s+(\d+)/)
+        return results[1] if results
+        return nil
+      end
+
+      def get_local_branch
+        git_branches = `git branch`
+        results = git_branches.match(/^\*\s+(\S+)/)
+        local_branch = results[1] if results
+        raise GitError.new("Could not find local branch name.") unless local_branch
+        return local_branch
+      end
+
+      def on_local_branch(&block)
+        begin
+          yield
+        rescue GitSiError => err
+          error_message err
+          exit false
+        end
+      end
+
+      def on_mirror_branch(&block)
+        local_branch = get_local_branch()
+        run_command("git checkout #{@@mirror_branch}")
+        begin
+          yield
+        rescue GitSiError => err
+          error_message err
+          exit false
+        ensure
+          run_command("git checkout #{local_branch}")
+        end
+      end
+
+      def success_message(message)
+        $stderr.puts set_color message, :green
+      end
+
+      def notice_message(message)
+        $stderr.puts set_color message, :yellow
+      end
+
+      def error_message(message)
+        $stderr.puts set_color message, :red
+      end
+
+      def run_command(command, options={})
+        if STDOUT.tty?
+          run(command, options)
+        else
+          run(command, options.update(verbose: false))
+        end
+        raise ShellError.new("There was an error while trying to run the command: #{command}. Look above for any errors.") unless $?.success?
+      end
+
+      def print_colordiff(diff)
+        diff.each_line do |line|
+          line.rstrip!
+          case line
+          when /^\+/, /^A/
+            line = set_color line, :green
+          when /^\-/, /^M/
+            line = set_color line, :red
+          when /^\?/
+            line = set_color line, :yellow
+          end
+          say line
+        end
+      end
+
+    end
+  end
+end

data/lib/git-si.rb

@@ -0,0 +1 @@
+require "git/si"

metadata

@@ -0,0 +1,141 @@
+--- !ruby/object:Gem::Specification
+name: git-si
+version: !ruby/object:Gem::Version
+  version: 0.0.1
+platform: ruby
+authors:
+- Payton Swick
+autorequire: 
+bindir: bin
+cert_chain: []
+date: 2013-10-29 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: thor
+  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: pager
+  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: thor
+  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: pager
+  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'
+description: 'Git Svn Interface: a simple git extention to use git locally with a
+  remote svn repo.'
+email:
+- payton@foolord.com
+executables:
+- git-si
+extensions: []
+extra_rdoc_files: []
+files:
+- .gitignore
+- Gemfile
+- LICENSE.txt
+- README.md
+- Rakefile
+- bin/git-si
+- git-si.gemspec
+- lib/git-si.rb
+- lib/git/si.rb
+- lib/git/si/version.rb
+homepage: ''
+licenses:
+- MIT
+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.0.5
+signing_key: 
+specification_version: 4
+summary: It's like a simple version of git-svn which doesn't keep track of history
+  locally.
+test_files: []