scvcs 0.2.0

data/bin/commands/merge.rb

@@ -0,0 +1,56 @@
+desc 'Merges two branches to the working directory'
+arg_name '<branch name>'
+command :merge do |c|
+  c.desc          'Abort the current merge. Resets the working dir and the next commit parents'
+  c.arg_name      'abort'
+  c.switch        :abort
+
+  c.desc          'Squashes the changes to a single commit. The next commit will have one parent'
+  c.arg_name      'squash'
+  c.switch        :squash
+
+  c.action do |global_options, options, args|
+    repository = global_options[:repository]
+    commit     = repository[:head, :commit]
+
+    if options[:abort]
+      repository.config['merge'] = {}
+      repository.config.save
+
+      repository.restore '.', commit
+
+      next
+    end
+
+    raise 'No branch specified to merge from' if args.empty?
+
+    commit_two = repository[args.first, :commit]
+
+    raise 'There is no branch with that name' if commit_two.nil?
+
+    merge_status = repository.merge commit, commit_two
+
+    unless options[:squash]
+      # Save the merged commit ids so that the next
+      # commit has both as parents.
+      repository.config['merge'] = {
+        'parents' => [
+          commit.id,
+          commit_two.id,
+        ]
+      }
+      repository.config.save
+    end
+
+    puts "# Merged #{args.first} into #{repository.head}"
+    puts
+
+    SCV::Formatters::MergeReport.print merge_status
+
+    unless merge_status[:conflicted].any?
+      puts "# You can now use `scv commit` to create the merge commit"
+      puts "# The next commit will have two parents" unless options[:squash]
+      puts "# To abort the merge (not create a merge commit) use `scv merge --abort`"
+    end
+  end
+end

data/bin/commands/remote.rb

@@ -0,0 +1,157 @@
+desc 'A set of commands to manage remotes and push/pull to them.'
+arg_name ''
+command :remote do |c|
+
+  c.desc 'Add a remote'
+  c.arg_name '<remote name> <remote HTTP url>'
+  c.command [:add, :new] do |add|
+    add.action do |global_options, options, args|
+      raise 'Please specify remote name and address' unless args.size == 2
+
+      name = args[0]
+      url  = args[1]
+
+      repository = global_options[:repository]
+      repository.config['remotes'] = {} unless repository.config['remotes']
+
+      raise 'There is already a remote with that name' if repository.config['remotes'].key? name
+
+      repository.config['remotes'][name] = {
+        'url' => url
+      }
+      repository.config.save
+    end
+  end
+
+  c.desc 'Delete a remote'
+  c.arg_name '<remote name>'
+  c.command [:delete, :remove] do |remove|
+    remove.action do |global_options, options, args|
+      raise 'Please specify remote name' unless args.size == 1
+
+      name = args[0]
+
+      repository = global_options[:repository]
+
+      unless repository.config['remotes'] and repository.config['remotes'].key? name
+        raise 'There is no remote with that name'
+      end
+
+      repository.config['remotes'].delete name
+      repository.config.save
+    end
+  end
+
+  c.desc 'Push local history to remote'
+  c.arg_name '<remote> <local branch> [<remote branch>]'
+  c.command :push do |push|
+    push.action do |global_options, options, args|
+      raise 'Please specify remote name and local branch' unless args.size >= 2
+
+      repository = global_options[:repository]
+
+      remote_name  = args[0]
+      local_branch = args[1]
+
+      raise 'There is no remote with this name' unless repository.config['remotes'][remote_name]
+      raise 'There is no branch with this name' unless repository[local_branch]
+
+      if args.size > 2
+        remote_branch = args[2]
+      else
+        remote_branch = local_branch
+      end
+
+      remote_file_store   = SCV::HTTPFileStore.new repository.config['remotes'][remote_name]['url']
+      remote_object_store = SCV::ObjectStore.new   remote_file_store
+
+      repository.push remote_object_store, local_branch, remote_branch
+    end
+  end
+
+  c.desc 'Fetch remote history objects to local branch. Does not do merging, only Fast-Forward'
+  c.arg_name '<remote> <remote branch> [<local branch>]'
+  c.command :fetch do |fetch|
+    fetch.action do |global_options, options, args|
+      raise 'Please specify remote name and remote branch' unless args.size >= 2
+
+      repository = global_options[:repository]
+
+      remote_name   = args[0]
+      remote_branch = args[1]
+
+      if args.size > 2
+        local_branch = args[2]
+      else
+        local_branch = remote_branch
+      end
+
+      unless repository[local_branch]
+        # There is no local branch with this name, so create it
+        repository.set_label local_branch, nil
+      end
+
+      raise 'There is no remote with this name' unless repository.config['remotes'][remote_name]
+
+      remote_file_store   = SCV::HTTPFileStore.new repository.config['remotes'][remote_name]['url']
+      remote_object_store = SCV::ObjectStore.new   remote_file_store
+
+      repository.fetch remote_object_store, remote_branch, local_branch
+    end
+  end
+
+  c.desc 'Pull remote history objects to local branch. Merges automatically'
+  c.arg_name '<remote> <remote branch> [<local branch>]'
+  c.command :pull do |pull|
+    pull.action do |global_options, options, args|
+      raise 'Please specify remote name and remote branch' unless args.size >= 2
+
+      repository = global_options[:repository]
+
+      remote_name   = args[0]
+      remote_branch = args[1]
+
+      if args.size > 2
+        local_branch = args[2]
+      else
+        local_branch = remote_branch
+      end
+
+      unless repository[local_branch]
+        # There is no local branch with this name, so create it
+        repository.set_label local_branch, nil
+      end
+
+      raise 'There is no remote with this name' unless repository.config['remotes'][remote_name]
+
+      remote_file_store   = SCV::HTTPFileStore.new repository.config['remotes'][remote_name]['url']
+      remote_object_store = SCV::ObjectStore.new   remote_file_store
+
+      # Step 1: Fetch to another branch
+      temp_branch = "#{remote_name}~#{remote_branch}"
+
+      # Create the temp branch if not existing
+      repository.set_label temp_branch, nil unless repository[temp_branch]
+
+      repository.fetch remote_object_store, remote_branch, temp_branch
+
+      # Step 2: Merge temp_branch into local_branch
+      dest_commit   = repository[temp_branch, :commit]
+      source_commit = repository[local_branch, :commit]
+      merge_status  = repository.merge source_commit, dest_commit
+
+      # Save the merged commit ids so that the next
+      # commit has both as parents.
+      repository.config['merge'] = {
+        'parents' => [
+          source_commit.id,
+          dest_commit.id,
+        ]
+      }
+      repository.config.save
+
+      SCV::Formatters::MergeReport.print merge_status
+    end
+  end
+
+end

data/bin/commands/restore.rb

@@ -0,0 +1,17 @@
+desc 'Resets files to the state they were in the specified commit'
+arg_name '<file> ...'
+command [:restore] do |c|
+  c.desc          'Use this specify which commit should be the used as reference'
+  c.arg_name      'source'
+  c.default_value 'head'
+  c.flag          [:s, :source]
+
+  c.action do |global_options, options, args|
+    repository = global_options[:repository]
+    commit     = repository[options[:source], :commit]
+
+    args.each do |path|
+      repository.restore path, commit
+    end
+  end
+end

data/bin/commands/server.rb

@@ -0,0 +1,10 @@
+desc 'Starts a barebones HTTP server to act as a remote repo'
+arg_name ''
+command [:server] do |c|
+  c.action do |global_options, options, args|
+    repository = global_options[:repository]
+
+    server = SCV::Server.new File.join(global_options[:dir], '.scv')
+    server.start
+  end
+end

data/bin/commands/status.rb

@@ -0,0 +1,52 @@
+desc 'Shows the created, modified and deleted files'
+arg_name ''
+command :status do |c|
+  c.action do |global_options, options, args|
+    repository = global_options[:repository]
+    commit     = repository[:head, :commit]
+    status     = repository.status commit,
+                                   ignore: [/^\.|\/\./]
+
+    if repository.head.nil?
+      puts "# No commits"
+    else
+      puts "# On branch #{repository.head}"
+      puts "# On commit #{commit.id.yellow}"
+    end
+
+    if repository.config['merge'] and repository.config['merge']['parents']
+      parents = repository.config['merge']['parents']
+
+      puts
+      puts "# Next commit parents:"
+
+      parents.each do |commit_id|
+        puts "#     - #{commit_id.yellow}"
+      end
+    end
+
+    puts
+
+    if status.none? { |_, files| files.any? }
+      puts "# No changes"
+    end
+
+    if status[:changed].any?
+      puts "# Changed:"
+      puts status[:changed].map { |file| "+-  #{file}".yellow }
+      puts
+    end
+
+    if status[:created].any?
+      puts "# New:"
+      puts status[:created].map { |file| "+   #{file}".green }
+      puts
+    end
+
+    if status[:deleted].any?
+      puts "# Deleted:"
+      puts status[:deleted].map { |file| "-   #{file}".red }
+      puts
+    end
+  end
+end

data/bin/formatters/changeset.rb

@@ -0,0 +1,43 @@
+module SCV::Formatters
+  module Changeset
+    def self.print(file_path, changeset)
+      added_count   = changeset.count { |change| change.adding?   }
+      changed_count = changeset.count { |change| change.changed?  }
+      deleted_count = changeset.count { |change| change.deleting? }
+
+      diff_lines = changeset.flat_map do |change|
+        if change.unchanged?
+          [" #{change.new_element}"]
+        elsif change.deleting?
+          ["-#{change.old_element}".red]
+        elsif change.adding?
+          ["+#{change.new_element}".green]
+        elsif change.changed?
+          ["-#{change.old_element}".red, "+#{change.new_element}".green]
+        else
+          raise "Unknown change in the diff #{change.action}"
+        end
+      end
+
+      puts
+      puts "##".bold
+      puts "# #{file_path}".bold
+      puts '#'.bold
+
+      if changeset.all? { |change| change.adding? }
+        puts "# New file".bold
+        puts "# #{added_count} #{added_count == 1 ? 'line' : 'lines'}".bold
+      elsif changeset.all? { |change| change.deleting? }
+        puts "# Deleted file".bold
+        puts "# #{deleted_count} #{deleted_count == 1 ? 'line' : 'lines'}".bold
+      else
+        puts "# #{added_count} #{added_count == 1 ? 'line' : 'lines'} added".bold       unless added_count.zero?
+        puts "# #{changed_count} #{changed_count == 1 ? 'line' : 'lines'} changed".bold unless changed_count.zero?
+        puts "# #{deleted_count} #{deleted_count == 1 ? 'line' : 'lines'} deleted".bold unless deleted_count.zero?
+      end
+
+      puts "##".bold
+      puts diff_lines.join('')
+    end
+  end
+end

data/bin/formatters/hierarchy.rb

@@ -0,0 +1,43 @@
+module SCV::Formatters
+  module Hierarchy
+    def self.print(hash, indent_size: 3, prefix: '')
+      hash.each_with_index do |(name, value), index|
+        is_last = index == hash.size - 1
+
+        Kernel.print prefix
+
+        unless prefix.empty?
+          if is_last
+            Kernel.print ' └'
+          else
+            Kernel.print ' ├'
+          end
+
+          Kernel.print '─' * indent_size.pred.pred
+          Kernel.print ' '
+        end
+        Kernel.print name
+
+        if value.is_a? Hash
+          if value.size.zero?
+            puts ": {}"
+          else
+            puts
+
+            if prefix.empty?
+              inner_prefix = ' ' * indent_size.pred.pred
+            else
+              inner_prefix = prefix + ' ' + (is_last ? ' ' : '│') + (' ' * indent_size.pred.pred)
+            end
+
+            print value, indent_size: indent_size, prefix: inner_prefix
+          end
+        elsif value.is_a? Array
+          puts ": [#{value.join(', ')}]"
+        else
+          puts ": #{value}"
+        end
+      end
+    end
+  end
+end

data/bin/formatters/merge_report.rb

@@ -0,0 +1,25 @@
+module SCV::Formatters
+  module MergeReport
+    def self.print(merge_status)
+      if merge_status[:merged].any?
+        puts "# Automatic merges:"
+
+        merge_status[:merged].each do |file|
+          puts "    #{file}".yellow
+        end
+
+        puts
+      end
+
+      if merge_status[:conflicted].any?
+        puts "# Conflicted files:"
+
+        merge_status[:conflicted].each do |file|
+          puts "    #{file}".red
+        end
+
+        puts
+      end
+    end
+  end
+end

data/bin/scv

@@ -0,0 +1,107 @@
+#!/usr/bin/env ruby
+
+require 'scv'
+require 'gli'
+require 'colorize'
+
+include GLI::App
+
+program_desc 'A simple VCS implemented in Ruby on top of the VCSToolkit library'
+
+version SCV::VERSION
+subcommand_option_handling :normal
+
+desc   'Print more stuff'
+switch [:v, :verbose]
+
+desc          'Colorize output if running in an interactive shell'
+default_value true
+switch        [:colors]
+
+desc          'The path to the working directory'
+default_value '.'
+arg_name      'directory path'
+flag          [:dir]
+
+# Require utilities
+require_relative 'utilities/shell'
+require_relative 'utilities/output'
+
+# Require formatters
+require_relative 'formatters/changeset'
+require_relative 'formatters/hierarchy'
+require_relative 'formatters/merge_report'
+
+# Require all available commands
+require_relative 'commands/init'
+require_relative 'commands/commit'
+require_relative 'commands/status'
+require_relative 'commands/history'
+require_relative 'commands/diff'
+require_relative 'commands/restore'
+require_relative 'commands/branch'
+require_relative 'commands/merge'
+require_relative 'commands/config'
+require_relative 'commands/server'
+require_relative 'commands/remote'
+
+pre do |global, command, options, args|
+  # Pre logic here
+  # Return true to proceed; false to abort and not call the
+  # chosen command
+  # Use skips_pre before a command to skip this block
+  # on that command only
+
+  # Check if the current directory is an SCV repository
+  # or is a subdirectory of one.
+  unless command.name == :init
+    working_dir = Pathname.new(global[:dir]).realpath
+    raise 'The working directory cannot be found' unless working_dir.directory?
+
+    working_dir = working_dir.enum_for(:ascend).find { |dir| dir.join('.scv').directory? }
+    raise "This directory is not (in) an SCV repository" if working_dir.nil?
+
+    global[:dir] = working_dir.to_path
+  end
+
+  # Initialize the repository object.
+  unless command.name == :init
+    repository = SCV::Repository.new global[:dir]
+    global[:repository] = repository
+  end
+
+  # Check if there is a commit in the repository
+  # as most commands expect one to exist.
+  unless [:init, :status, :commit, :server].include? command.name
+    raise "There are no commits in the repository" if repository.branch_head.nil?
+  end
+
+  # Switch colors on or off
+  unless global[:colors] and $stdout.isatty
+    # Disable colorize
+    String.class_eval do
+      alias_method :original_colorize, :colorize
+
+      def colorize(*args)
+        # Ignore color requests
+        self
+      end
+    end
+  end
+
+  true
+end
+
+post do |global, command, options, args|
+  # Post logic here
+  # Use skips_post before a command to skip this
+  # block on that command only
+end
+
+on_error do |exception|
+  # Error logic here
+  # return false to skip default error handling
+  true
+end
+
+exit run(ARGV)