between_meals 0.0.5 → 0.0.6

data/lib/between_meals/repo/git.rb

@@ -1,39 +1,50 @@
 # vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2
 
 # Copyright 2013-present Facebook
-# 
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# Require openssl in order to make rugged work reliably
+require 'openssl'
+
 require 'rugged'
 require 'mixlib/shellout'
 require 'between_meals/changeset'
+require 'between_meals/repo/git/cmd'
 
 module BetweenMeals
-  # Local checkout wrapper
   class Repo
-    # Git provider
     class Git < BetweenMeals::Repo
       def setup
         if File.exists?(File.expand_path(@repo_path))
-          @repo = Rugged::Repository.new(File.expand_path(@repo_path))
+          begin
+            @repo = Rugged::Repository.new(File.expand_path(@repo_path))
+          rescue
+            @repo = nil
+          end
         else
           @repo = nil
         end
         @bin = 'git'
+        @cmd = BetweenMeals::Repo::Git::Cmd.new(
+          :bin => @bin,
+          :cwd => @repo_path,
+          :logger => @logger,
+        )
       end
 
       def exists?
-        @repo && !@repo.empty?
+        !@repo.nil?
       end
 
       def head_rev
@@ -58,34 +69,30 @@ module BetweenMeals
       end
 
       def head_parents
-        @repo.head.target.parents
+        @repo.head.target.parents.map do |x|
+          { :rev => x.tree.oid, :time => x.time }
+        end
       end
 
       def checkout(url)
-        s = Mixlib::ShellOut.new(
-          "#{@bin} clone #{url} #{@repo} #{@repo_path}"
-        ).run_command
-        s.error!
+        @cmd.clone(url, @repo_path)
         @repo = Rugged::Repository.new(File.expand_path(@repo_path))
       end
 
       # Return files changed between two revisions
       def changes(start_ref, end_ref)
-        check_refs(start_ref, end_ref)
-        s = Mixlib::ShellOut.new(
-          "#{@bin} diff --name-status #{start_ref} #{end_ref}",
-          :cwd => File.expand_path(@repo_path)
-        )
-        s.run_command.error!
+        valid_ref?(start_ref)
+        valid_ref?(end_ref) if end_ref
+        stdout = @cmd.diff(start_ref, end_ref).stdout
         begin
-          parse_status(s.stdout).compact
+          parse_status(stdout).compact
         rescue => e
           # We've seen some weird non-reproducible failures here
           @logger.error(
             'Something went wrong. Please please report this output.'
           )
           @logger.error(e)
-          s.stdout.lines.each do |line|
+          stdout.lines.each do |line|
             @logger.error(line.strip)
           end
           exit(1)
@@ -93,16 +100,7 @@ module BetweenMeals
       end
 
       def update
-        cmd = Mixlib::ShellOut.new(
-          "#{@bin} pull --rebase", :cwd => File.expand_path(@repo_path)
-        )
-        cmd.run_command
-        if cmd.exitstatus != 0
-          @logger.error('Something went wrong with git!')
-          @logger.error(cmd.stdout)
-          fail
-        end
-        cmd.stdout
+        @cmd.pull.stdout
       end
 
       # Return all files
@@ -110,33 +108,35 @@ module BetweenMeals
         @repo.index.map { |x| { :path => x[:path], :status => :created } }
       end
 
-      def status
-        cmd = Mixlib::ShellOut.new(
-          "#{@bin} status --porcelain 2>&1",
-          :cwd => File.expand_path(@repo_path)
-        )
-        cmd.run_command
-        if cmd.exitstatus != 0
-          @logger.error('Something went wrong with git!')
-          @logger.error(cmd.stdout)
-          fail
+      def upstream?(rev, master = 'remotes/trunk')
+        if @cmd.merge_base(rev, master).stdout.strip == rev
+          return true
         end
-        cmd.stdout
+        return false
+      rescue
+        return false
       end
 
-      private
+      def status
+        @cmd.status.stdout.strip
+      end
+
+      def name
+        @cmd.config('user.name').stdout.strip
+      end
+
+      def email
+        @cmd.config('user.email').stdout.strip
+      end
 
-      def check_refs(start_ref, end_ref)
-        unless @repo.exists?(start_ref)
+      def valid_ref?(ref)
+        unless @repo.exists?(ref)
           fail Changeset::ReferenceError
         end
-        unless end_ref.nil?
-          unless @repo.exists?(end_ref)
-            fail Changeset::ReferenceError
-          end
-        end
       end
 
+      private
+
       def parse_status(changes)
         # man git-diff-files
         # Possible status letters are:

data/lib/between_meals/repo/git/cmd.rb

@@ -0,0 +1,49 @@
+# vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2
+
+# Copyright 2013-present Facebook
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'between_meals/cmd'
+
+module BetweenMeals
+  class Repo
+    class Git < BetweenMeals::Repo
+      class Cmd < BetweenMeals::Cmd
+        def config(key)
+          cmd("config #{key}")
+        end
+
+        def clone(url, repo_path)
+          cmd("clone #{url} #{repo_path}", '/tmp')
+        end
+
+        def diff(start_ref, end_ref)
+          cmd("diff --name-status #{start_ref} #{end_ref}")
+        end
+
+        def pull
+          cmd('pull --rebase')
+        end
+
+        def merge_base(rev, master)
+          cmd("merge-base #{rev} #{master}")
+        end
+
+        def status
+          cmd('status --porcelain 2>&1')
+        end
+      end
+    end
+  end
+end

data/lib/between_meals/repo/hg.rb

@@ -0,0 +1,214 @@
+# vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2
+
+# Copyright 2013-present Facebook
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'pathname'
+require 'mixlib/shellout'
+require 'between_meals/changeset'
+require 'between_meals/repo/hg/cmd'
+
+module BetweenMeals
+  class Repo
+    class Hg < BetweenMeals::Repo
+      def setup
+        @bin = 'hg'
+        @cmd = BetweenMeals::Repo::Hg::Cmd.new(
+          :bin => @bin,
+          :cwd => @repo_path,
+          :logger => @logger,
+        )
+      end
+
+      def exists?
+        Dir.exists?(Pathname.new(@repo_path).join('.hg'))
+      end
+
+      def head_rev
+        @cmd.log('node').stdout
+      end
+
+      def checkout(url)
+        @cmd.clone(url, @repo_path)
+      end
+
+      # Return files changed between two revisions
+      def changes(start_ref, end_ref)
+        valid_ref?(start_ref)
+        valid_ref?(end_ref) if end_ref
+        stdout = @cmd.status(start_ref, end_ref).stdout
+        begin
+          parse_status(stdout).compact
+        rescue => e
+          # We've seen some weird non-reproducible failures here
+          @logger.error(
+            'Something went wrong. Please please report this output.'
+          )
+          @logger.error(e)
+          stdout.lines.each do |line|
+            @logger.error(line.strip)
+          end
+          exit(1)
+        end
+      end
+
+      def update
+        @cmd.pull.stdout
+      rescue
+        @logger.error('Something went wrong with hg!')
+        @logger.error(cmd.stdout)
+        raise
+      end
+
+      # Return all files
+      def files
+        @cmd.manifest.stdout.split("\n").map do |x|
+          { :path => x, :status => :created }
+        end
+      end
+
+      def head_parents
+        [{
+          :time => Time.parse(@cmd.log('date|isodate', 'master').stdout),
+          :rev => @cmd.log('node', 'master').stdout,
+        }]
+      rescue
+        [{
+          :time => nil,
+          :rev => nil,
+        }]
+      end
+
+      def last_author
+        [
+          /^.*<(.*)>$/,
+          /^(.*@.*)$/,
+        ].each do |re|
+          m = @cmd.log('author').stdout.match(re)
+          return { :email => m[1] } if m
+        end
+        return { :email => nil }
+      end
+
+      def last_msg
+        @cmd.log('desc').stdout
+      rescue
+        nil
+      end
+
+      def last_msg=(msg)
+        if last_msg.strip != msg.strip
+          @cmd.amend(msg.strip)
+        end
+      end
+
+      def email
+        username[2]
+      rescue
+        nil
+      end
+
+      def name
+        username[1]
+      rescue
+        nil
+      end
+
+      def status
+        @cmd.status.stdout
+      end
+
+      def upstream?(rev)
+        # Check if commit is an ancestor of master
+        # Returns the diff if common ancestor is found,
+        # returns nothing if not
+        if @cmd.rev("'ancestor(master,#{rev}) & #{rev}'").stdout.empty?
+          return false
+        else
+          return true
+        end
+      end
+
+      def valid_ref?(ref)
+        @cmd.rev(ref)
+        return true
+      rescue
+        raise Changeset::ReferenceError
+      end
+
+      private
+
+      def username
+        @cmd.username.stdout.lines.first.strip.match(/^(.*?)(?:\s<(.*)>)?$/)
+      end
+
+      def parse_status(changes)
+        # The codes used to show the status of files are:
+        #
+        #  M = modified
+        #  A = added
+        #  R = removed
+        #  C = clean
+        #  ! = missing (deleted by non-hg command, but still tracked)
+        #  ? = not tracked
+        #  I = ignored
+        #    = origin of the previous file (with --copies)
+
+        # rubocop:disable MultilineBlockChain
+        changes.lines.map do |line|
+          case line
+          when /^A (\S+)$/
+            {
+              :status => :added,
+              :path => Regexp.last_match(1)
+            }
+          when /^C (\S+)$/
+            {
+              :status => :clean,
+              :path => Regexp.last_match(1)
+            }
+          when /^R (\S+)$/
+            {
+              :status => :deleted,
+              :path => Regexp.last_match(1)
+            }
+          when /^M (\S+)$/
+            {
+              :status => :modified,
+              :path => Regexp.last_match(1)
+            }
+          when /^! (\S+)$/
+            {
+              :status => :missing,
+              :path => Regexp.last_match(1)
+            }
+          when /^\? (\S+)$/
+            {
+              :status => :untracked,
+              :path => Regexp.last_match(1)
+            }
+          when /^I (\S+)$/
+            {
+              :status => :ignored,
+              :path => Regexp.last_match(1)
+            }
+          else
+            fail 'No match'
+          end
+        end
+        # rubocop:enable MultilineBlockChain
+      end
+    end
+  end
+end

data/lib/between_meals/repo/hg/cmd.rb

@@ -0,0 +1,72 @@
+# vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2
+
+# Copyright 2013-present Facebook
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'between_meals/cmd'
+require 'tempfile'
+
+module BetweenMeals
+  class Repo
+    class Hg < BetweenMeals::Repo
+      class Cmd < BetweenMeals::Cmd
+        def rev(rev)
+          cmd("log -r #{rev}")
+        end
+
+        def log(template, rev = '.')
+          cmd("log -r #{rev} -l 1 -T '{#{template}}'")
+        end
+
+        def clone(url, repo_path)
+          cmd("clone #{url} #{repo_path}")
+        end
+
+        def pull
+          cmd('pull --rebase')
+        end
+
+        def manifest
+          cmd('manifest')
+        end
+
+        def username
+          cmd('config ui.username')
+        end
+
+        def amend(msg)
+          f = Tempfile.new('between_meals.hg.amend')
+          begin
+            f.write(msg)
+            f.flush
+            cmd("commit --amend -l #{f.path}")
+          ensure
+            f.close
+            f.unlink
+          end
+        end
+
+        def status(start_ref = nil, end_ref = nil)
+          if start_ref && end_ref
+            cmd("status --rev #{start_ref} --rev #{end_ref}")
+          elsif start_ref
+            cmd("status --rev #{start_ref}")
+          else
+            cmd('status')
+          end
+        end
+      end
+    end
+  end
+end