between_meals 0.0.5 → 0.0.6

data/lib/between_meals/repo/svn.rb

@@ -1,134 +1,117 @@
 # 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 'between_meals/repo'
 require 'between_meals/changeset'
 require 'mixlib/shellout'
+require 'between_meals/repo/svn/cmd'
 
 module BetweenMeals
-  # Local checkout wrapper
   class Repo
-    # SVN implementation
     class Svn < BetweenMeals::Repo
       def setup
         @bin = 'svn'
+        @cmd = BetweenMeals::Repo::Svn::Cmd.new(
+          :bin => @bin,
+          :cwd => '/tmp',
+          :logger => @logger,
+        )
       end
 
       def exists?
-        # this shuold be better
-        Dir.exists?(@repo_path)
+        Dir.exists?(Pathname.new(@repo_path).join('.svn'))
       end
 
       def head_rev
-        s = Mixlib::ShellOut.new("#{@bin} info #{@repo_path}").run_command
-        s.error!
-        s.stdout.each_line do |line|
+        @cmd.info(@repo_path).stdout.each_line do |line|
           m = line.match(/Last Changed Rev: (\d+)$/)
           return m[1] if m
         end
       end
 
       def latest_revision
-        s = Mixlib::ShellOut.new("#{@bin} info #{@repo_path}").run_command
-        s.error!
-        s.stdout.each do |line|
+        @cmd.info(@repo_path).stdout.each_line do |line|
           m = line.match(/Revision: (\d+)$/)
           return m[1] if m
         end
       end
 
       def checkout(url)
-        s = Mixlib::ShellOut.new(
-          "#{@bin} co --ignore-externals #{url} #{@repo_path}").run_command
-        s.error!
+        @cmd.co(url, @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 -r #{start_ref}:#{end_ref} --summarize #{@repo_path}")
-        s.run_command.error!
+        valid_ref?(start_ref)
+        valid_ref?(end_ref) if end_ref
+
         @logger.info("Diff between #{start_ref} and #{end_ref}")
-        s.stdout.lines.map do |line|
-          m = line.match(/^(\w)\w?\s+(\S+)$/)
-          fail "Could not parse line: #{line}" unless m
-
-          {
-            :status => m[1] == 'D' ? :deleted : :modified,
-            :path => m[2].sub("#{@repo_path}/", '')
-          }
+        changes = @cmd.diff(start_ref, end_ref, @repo_path).stdout
+
+        begin
+          parse_status(changes).compact
+        rescue => e
+          @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
-        cleanup
-        revert
-        up
+        @cmd.cleanup(@repo_path)
+        @cmd.revert(@repo_path)
+        @cmd.update(@repo_path)
       end
 
-      # Return all files
       def files
-        s = Mixlib::ShellOut.new("#{@bin} ls --depth infinity #{@repo_path}")
-        s.run_command
-        s.error!
-        s.stdout.split("\n").map do |x|
+        @cmd.ls.stdout.split("\n").map do |x|
           { :path => x, :status => :created }
         end
       end
 
-      private
-
-      def run(cmd)
-        Mixlib::ShellOut.new(cmd).run_command.error!
-      end
-
-      def revert
-        run("#{@bin} revert -R #{@repo_path}")
-      end
-
-      def up
-        run("#{@bin} update #{@repo_path}")
+      def upstream?
       end
 
-      def cleanup
-        run("#{@bin} cleanup #{@repo_path}")
-      end
-
-      def first_revision
-        0
+      def valid_ref?(ref)
+        @cmd.info_r(ref, @repo_path)
+      rescue
+        raise Changeset::ReferenceError
       end
 
       private
 
-      def check_refs(start_ref, end_ref)
-        s = Mixlib::ShellOut.new(
-              "#{@bin} info -r #{start_ref}",
-              :cwd => @repo_path
-            ).run_command
-        s.error!
-        if end_ref
-          s = Mixlib::ShellOut.new(
-                "#{@bin} info -r #{end_ref}",
-                :cwd => @repo_path
-              ).run_command
-          s.error!
+      def parse_status(changes)
+        # http://svnbook.red-bean.com/en/1.0/re26.html
+        changes.lines.map do |line|
+          case line
+          when (/^([\w ])\w?\s+(\S+)$/)
+            {
+              :status => Regexp.last_match(1) == 'D' ? :deleted : :modified,
+              :path => Regexp.last_match(2).sub("#{@repo_path}/", ''),
+            }
+          else
+            fail 'No match'
+          end
         end
-      rescue
-        raise Changeset::ReferenceError
       end
     end
   end

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

@@ -0,0 +1,56 @@
+# 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 Svn < BetweenMeals::Repo
+      class Cmd < BetweenMeals::Cmd
+        def diff(start_ref, end_ref, repo_path)
+          cmd("diff -r #{start_ref}:#{end_ref} --summarize #{repo_path}")
+        end
+
+        def info(repo_path)
+          cmd("info #{repo_path}")
+        end
+
+        def info_r(ref, repo_path)
+          cmd("info -r #{ref} #{repo_path}")
+        end
+
+        def co(url, repo_path)
+          cmd("co --ignore-externals #{url} #{repo_path}")
+        end
+
+        def revert(repo_path)
+          cmd("revert -R #{repo_path}")
+        end
+
+        def update(repo_path)
+          cmd("update #{repo_path}")
+        end
+
+        def cleanup(repo_path)
+          cmd("cleanup #{repo_path}")
+        end
+
+        def ls(repo_path)
+          cmd("ls --depth infinity #{repo_path}")
+        end
+      end
+    end
+  end
+end

data/lib/between_meals/util.rb

@@ -1,13 +1,13 @@
 # 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.

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: between_meals
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Phil Dibowitz
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2015-01-05 00:00:00 Z
+date: 2015-11-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: colorize
@@ -116,6 +116,34 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: rubocop
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: simplecov
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id009
 description: Library for calculation Chef differences between revisions
 email: 
 executables: []
@@ -128,16 +156,21 @@ extra_rdoc_files:
 files: 
 - README.md
 - LICENSE
-- lib/between_meals/changeset.rb
-- lib/between_meals/repo.rb
-- lib/between_meals/util.rb
 - lib/between_meals/knife.rb
-- lib/between_meals/changes/role.rb
+- lib/between_meals/cmd.rb
+- lib/between_meals/util.rb
+- lib/between_meals/repo.rb
+- lib/between_meals/changeset.rb
 - lib/between_meals/changes/change.rb
+- lib/between_meals/changes/role.rb
 - lib/between_meals/changes/cookbook.rb
 - lib/between_meals/changes/databag.rb
+- lib/between_meals/repo/svn/cmd.rb
+- lib/between_meals/repo/hg/cmd.rb
+- lib/between_meals/repo/git/cmd.rb
 - lib/between_meals/repo/svn.rb
 - lib/between_meals/repo/git.rb
+- lib/between_meals/repo/hg.rb
 homepage: https://github.com/facebook/between-meals
 licenses: 
 - Apache