xmigra 1.5.1 → 1.6.0

data/lib/xmigra/vcs_support/git.rb

@@ -1,4 +1,5 @@
 require 'xmigra/console'
+require 'xmigra/migration_chain'
 
 module XMigra
   module GitSpecifics
@@ -7,6 +8,7 @@ module XMigra
     MASTER_HEAD_ATTRIBUTE = 'xmigra-master'
     MASTER_BRANCH_SUBDIR = 'xmigra-master'
     PRODUCTION_CHAIN_EXTENSION_COMMAND = 'xmigra-on-production-chain-extended'
+    ATTRIBUTE_UNSPECIFIED = 'unspecified'
     
     class AttributesFile
       def initialize(effect_root, access=:shared)
@@ -161,7 +163,16 @@ module XMigra
     end
     
     def git(*args)
-      Dir.chdir(self.path) do |pwd|
+      _path = begin
+        self.path
+      rescue NameError
+        begin
+          self.schema_dir
+        rescue NameError
+          Pathname(self.file_path).dirname
+        end
+      end
+      Dir.chdir(_path) do |pwd|
         GitSpecifics.run_git(*args)
       end
     end
@@ -211,7 +222,13 @@ module XMigra
     end
     
     def branch_identifier
-      return (if self.production
+      for_production = begin
+        self.production
+      rescue NameError
+        false
+      end
+      
+      return (if for_production
         self.git_branch_info[0]
       else
         return @git_branch_identifier if defined? @git_branch_identifier
@@ -227,9 +244,25 @@ module XMigra
       if commit
         self.git_fetch_master_branch
         
-        # If there are no commits between the master head and *commit*, then
-        # *commit* is production-ish
-        return (self.git_commits_in? self.git_master_local_branch..commit) ? :development : :production
+        # If there are commits between the master head and *commit*, then
+        # *commit* is not production-ish
+        if self.git_commits_in? self.git_master_local_branch..commit
+          return :development
+        end
+        
+        # Otherwise, look to see if all migrations in the migration chain for
+        # commit are in the master head with no diffs -- the migration chain
+        # is a "prefix" of the chain in the master head:
+        migration_chain = RepoStoredMigrationChain.new(
+          commit,
+          Pathname(path).join(SchemaManipulator::STRUCTURE_SUBDIR),
+        )
+        return :production if self.git(
+          :diff, '--name-only',
+          self.git_master_local_branch, commit, '--',
+          *migration_chain.map(&:file_path)
+        ).empty?
+        return :development
       end
       
       return nil unless self.git_master_head(:required=>false)
@@ -253,6 +286,15 @@ module XMigra
       return nil
     end
     
+    def vcs_contents(path, options={})
+      args = []
+      
+      commit = options.fetch(:revision, 'HEAD')
+      args << "#{commit}:#{path}"
+      
+      git(:show, *args)
+    end
+    
     def vcs_prod_chain_extension_handler
       attr_val = GitSpecifics.attr_values(
         PRODUCTION_CHAIN_EXTENSION_COMMAND,
@@ -273,6 +315,124 @@ module XMigra
       return attr_val
     end
     
+    def vcs_uncommitted?
+      git_status == '??'
+    end
+    
+    class VersionComparator
+      # vcs_object.kind_of?(GitSpecifics)
+      def initialize(vcs_object, options={})
+        @object = vcs_object
+        @expected_content_method = options[:expected_content_method]
+        @path_statuses = Hash.new do |h, file_path|
+          file_path = Pathname(file_path).expand_path
+          next h[file_path] if h.has_key?(file_path)
+          h[file_path] = @object.git_retrieve_status(file_path)
+        end
+      end
+      
+      def relative_version(file_path)
+        # Comparing @object.file_path (a) to file_path (b)
+        #
+        # returns: :newer, :equal, :older, or :missing
+        
+        b_status = @path_statuses[file_path]
+        
+        return :missing if b_status.nil? || b_status.include?('D')
+        
+        a_status = @path_statuses[@object.file_path]
+        
+        if a_status == '??' || a_status[0] == 'A'
+          if b_status == '??' || b_status[0] == 'A' || b_status.include?('M')
+            return relative_version_by_content(file_path)
+          end
+          
+          return :older
+        elsif a_status == '  '
+          return :newer unless b_status == '  '
+          
+          return begin
+            a_commit = latest_commit(@object.file_path)
+            b_commit = latest_commit(file_path)
+            
+            if @object.git_commits_in? a_commit..b_commit, file_path
+              :newer
+            elsif @object.git_commits_in? b_commit..a_commit, @object.file_path
+              :older
+            else
+              :equal
+            end
+          end
+        elsif b_status == '  '
+          return :older
+        else
+          return relative_version_by_content(file_path)
+        end
+      end
+      
+      def latest_commit(file_path)
+        @object.git(
+          :log,
+          '--pretty=format:%H',
+          '-1',
+          '--',
+          file_path
+        )
+      end
+      
+      def relative_version_by_content(file_path)
+        ec_method = @expected_content_method
+        if !ec_method || @object.send(ec_method, file_path)
+          return :equal
+        else
+          return :newer
+        end
+      end
+    end
+    
+    def vcs_comparator(options={})
+      VersionComparator.new(self, options)
+    end
+    
+    def vcs_latest_revision(a_file=nil)
+      if a_file.nil? && defined? @vcs_latest_revision
+        return @vcs_latest_revision
+      end
+      
+      git(
+        :log,
+        '-n1',
+        '--pretty=format:%H',
+        '--',
+        a_file || file_path,
+        :quiet=>true
+      ).chomp.tap do |val|
+        @vcs_latest_revision = val if a_file.nil?
+      end
+    end
+    
+    def vcs_changes_from(from_commit, file_path)
+      git(:diff, from_commit, '--', file_path)
+    end
+    
+    def vcs_most_recent_committed_contents(file_path)
+      git(:show, "HEAD:#{file_path}", :quiet=>true)
+    end
+    
+    def git_status
+      @git_status ||= git_retrieve_status(file_path)
+    end
+    
+    def git_retrieve_status(a_path)
+      return nil unless Pathname(a_path).exist?
+      
+      if git('status', '--porcelain', a_path.to_s) =~ /^.+?(?= \S)/
+        $&
+      else
+        '  '
+      end
+    end
+    
     def production_pattern
       ".+"
     end
@@ -333,17 +493,17 @@ module XMigra
         :required=>options[:required]
       )
       return nil if master_head.nil?
-      return @git_master_head = master_head
+      return @git_master_head = (master_head if master_head != GitSpecifics::ATTRIBUTE_UNSPECIFIED)
     end
     
     def git_branch
       return @git_branch if defined? @git_branch
-      return @git_branch = git('rev-parse', %w{--abbrev-ref HEAD}).chomp
+      return @git_branch = git('rev-parse', %w{--abbrev-ref HEAD}, :quiet=>true).chomp
     end
     
     def git_schema_commit
       return @git_commit if defined? @git_commit
-      reported_commit = git(:log, %w{-n1 --format=%H --}, self.path).chomp
+      reported_commit = git(:log, %w{-n1 --format=%H --}, self.path, :quiet=>true).chomp
       raise VersionControlError, "Schema not committed" if reported_commit.empty?
       return @git_commit = reported_commit
     end
@@ -412,5 +572,26 @@ module XMigra
         path || self.path
       ) != ''
     end
+    
+    class RepoStoredMigrationChain < MigrationChain
+      def initialize(branch, path, options={})
+        @branch = branch
+        options[:vcs_specifics] = GitSpecifics
+        super(path, options)
+      end
+      
+      protected
+      def yaml_of_file(fpath)
+        fdir, fname = Pathname(fpath).split
+        file_contents = Dir.chdir(fdir) do |pwd|
+          GitSpecifics.run_git(:show, "#{@branch}:./#{fname}")
+        end
+        begin
+          YAML.load(file_contents, fpath.to_s)
+        rescue
+          raise XMigra::Error, "Error loading/parsing #{fpath}"
+        end
+      end
+    end
   end
 end

data/lib/xmigra/vcs_support/svn.rb

@@ -31,7 +31,7 @@ module XMigra
         )
         cmd_str = cmd_parts.join(' ')
         
-        output = `#{cmd_str}`
+        output = `#{cmd_str} 2>/dev/null`
         raise(VersionControlError, "Subversion command failed with exit code #{$?.exitstatus}") unless $?.success?
         return output if raw_result && !no_result
         return REXML::Document.new(output) unless no_result
@@ -222,6 +222,75 @@ END_OF_MESSAGE
       subversion(:resolve, '--accept=working', path, :get_result=>false)
     end
     
+    def vcs_uncommitted?
+      status = subversion_retrieve_status(file_path).elements['entry/wc-status']
+      status.nil? || status.attributes['item'] == 'unversioned'
+    end
+    
+    class VersionComparator
+      # vcs_object.kind_of?(SubversionSpecifics)
+      def initialize(vcs_object, options={})
+        @object = vcs_object
+        @expected_content_method = options[:expected_content_method]
+        @path_status = Hash.new do |h, file_path|
+          file_path = Pathname(file_path).expand_path
+          next h[file_path] if h.has_key?(file_path)
+          h[file_path] = @object.subversion_retrieve_status(file_path)
+        end
+      end
+      
+      def relative_version(file_path)
+        # Comparing @object.file_path (a) to file_path (b)
+        #
+        # returns: :newer, :equal, :older, or :missing
+        
+        b_status = @path_status[file_path].elements['entry/wc-status']
+        
+        return :missing if b_status.nil? || ['deleted', 'missing'].include?(b_status.attributes['item'])
+        
+        a_status = @path_status[@object.file_path].elements['entry/wc-status']
+        
+        if ['unversioned', 'added'].include? a_status.attributes['item']
+          if ['unversioned', 'added', 'modified'].include? b_status.attributes['item']
+            return relative_version_by_content(file_path)
+          end
+          
+          return :older
+        elsif a_status.attributes['item'] == 'normal'
+          return :newer unless b_status.attributes['item'] == 'normal'
+          
+          return begin
+            a_revision = a_status.elements['commit'].attributes['revision'].to_i
+            b_revision = b_status.elements['commit'].attributes['revision'].to_i
+            
+            if a_revision < b_revision
+              :newer
+            elsif b_revision < a_revision
+              :older
+            else
+              :equal
+            end
+          end
+        elsif b_status.attributes['item'] == 'normal'
+          return :older
+        else
+          return relative_version_by_content(file_path)
+        end
+      end
+      
+      def relative_version_by_content(file_path)
+        ec_method = @expected_content_method
+        if !ec_method || @object.send(ec_method, file_path)
+          return :equal
+        else
+          return :newer
+        end
+      end
+    end
+    
+    def vcs_comparator(options={})
+      VersionComparator.new(self, options)
+    end
     
     def vcs_move(old_path, new_path)
       subversion(:move, old_path, new_path, :get_result=>false)
@@ -264,6 +333,43 @@ END_OF_MESSAGE
         subversion(:cat, "-r#{tracer.earliest_loaded_revision}", path.to_s)
       end
     end
+    
+    def vcs_contents(path, options={})
+      args = []
+      
+      if options[:revision]
+        args << "-r#{options[:revision]}"
+      end
+      
+      args << path.to_s
+      
+      subversion(:cat, *args)
+    end
+    
+    def vcs_latest_revision(a_file=nil)
+      if a_file.nil? && defined? @vcs_latest_revision
+        return @vcs_latest_revision
+      end
+      
+      val = subversion(:status, '-v', a_file || file_path).elements[
+        'string(status/target/entry/wc-status/commit/@revision)'
+      ]
+      (val.nil? ? val : val.to_i).tap do |val|
+        @vcs_latest_revision = val if a_file.nil?
+      end
+    end
+    
+    def vcs_changes_from(from_revision, file_path)
+      subversion(:diff, '-r', from_revision, file_path, :raw=>true)
+    end
+    
+    def vcs_most_recent_committed_contents(file_path)
+      subversion(:cat, file_path)
+    end
+    
+    def subversion_retrieve_status(file_path)
+      subversion(:status, '-v', file_path).elements['status/target']
+    end
   end
   
   class SvnHistoryTracer

data/lib/xmigra/version.rb

@@ -1,3 +1,3 @@
 module XMigra
-  VERSION = "1.5.1"
+  VERSION = "1.6.0"
 end

data/lib/xmigra.rb

@@ -251,8 +251,47 @@ module XMigra
       end
     end
     
-    def secure_digest(s)
-      [Digest::MD5.digest(s)].pack('m0').chomp
+    def secure_digest(s, options={:encoding=>:base64})
+      digest_value = Digest::MD5.digest(s)
+      case options[:encoding]
+      when nil
+        digest_value
+      when :base64
+        [digest_value].pack('m0').chomp
+      when :base32
+        base32encoding(digest_value)
+      end
+    end
+    
+    BASE_32_ENCODING = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ234567'
+    def base32encoding(bytes)
+      carry = 0
+      carry_bits = 0
+      ''.tap do |result|
+        bytes.each_byte do |b|
+          # From b we need the (5 - carry_bits) most significant bits
+          needed_bits = 5 - carry_bits
+          code_unit = (carry << needed_bits) | b >> (8 - needed_bits)
+          result << BASE_32_ENCODING[code_unit]
+          
+          if needed_bits <= 3
+            # Extra character out of this byte
+            code_unit = (b >> (3 - needed_bits)) & 0x1F
+            result << BASE_32_ENCODING[code_unit]
+            carry_bits = (3 - needed_bits)
+          else
+            carry_bits = 8 - needed_bits
+          end
+          carry = b & ((1 << carry_bits) - 1)
+        end
+        
+        if carry_bits > 0
+          code_unit = carry << (5 - carry_bits)
+          result << BASE_32_ENCODING[code_unit]
+        end
+        
+        result << '=' * (7 - ((result.length + 7) % 8))
+      end
     end
   end
   
@@ -300,6 +339,9 @@ module XMigra
       ARGV,
       :error=>proc do |e|
         STDERR.puts("#{e} (#{e.class})") unless e.is_a?(XMigra::Program::QuietError)
+        if e.class.const_defined? :COMMAND_LINE_HELP
+          STDERR.puts(XMigra.program_message(e.class::COMMAND_LINE_HELP))
+        end
         exit(2) if e.is_a?(OptionParser::ParseError)
         exit(2) if e.is_a?(XMigra::Program::ArgumentError)
         exit(1)
@@ -322,6 +364,7 @@ require 'xmigra/function'
 require 'xmigra/plugin'
 
 require 'xmigra/access_artifact_collection'
+require 'xmigra/impdecl_migration_adder'
 require 'xmigra/index'
 require 'xmigra/index_collection'
 require 'xmigra/migration'
@@ -331,6 +374,8 @@ require 'xmigra/branch_upgrade'
 require 'xmigra/schema_manipulator'
 require 'xmigra/schema_updater'
 require 'xmigra/new_migration_adder'
+require 'xmigra/new_index_adder'
+require 'xmigra/new_access_artifact_adder'
 require 'xmigra/permission_script_writer'
 require 'xmigra/source_tree_initializer'
 

data/test/git_vcs.rb

@@ -167,10 +167,6 @@ if GIT_PRESENT
       
       `git clone "#{upstream.expand_path}" "#{repo}" 2>/dev/null`
       
-      Dir.chdir(upstream) do
-        commit_a_migration "foo table"
-      end
-      
       Dir.chdir(repo) do
         commit_a_migration "bar table"
         
@@ -268,4 +264,68 @@ if GIT_PRESENT
       end
     end
   end
+  
+  run_test "XMigra does not put grants in upgrade by default" do
+    1.temp_dirs do |repo|
+      initialize_git_repo(repo)
+      
+      Dir.chdir(repo) do
+        commit_a_migration "first table"
+        File.open(XMigra::SchemaManipulator::PERMISSIONS_FILE, 'w') do |grants_file|
+          YAML.dump(
+            {
+              "foo" => {
+                "alice" => "ALL",
+                "bob" => "SELECT",
+                "candace" => ["INSERT", "SELECT", "UPDATE"],
+              },
+            }, 
+            grants_file
+          )
+        end
+        
+        XMigra::SchemaUpdater.new('.').tap do |tool|
+          sql = tool.update_sql
+          assert_not_include sql, /GRANT\s+ALL.*?alice/
+          assert_not_include sql, /GRANT\s+SELECT.*?bob/
+          assert_not_include sql, /GRANT\s+INSERT.*?candace/
+          assert_not_include sql, /GRANT\s+SELECT.*?candace/
+          assert_not_include sql, /GRANT\s+UPDATE.*?candace/
+        end
+      end
+    end
+  end
+  
+  run_test "XMigra puts grants in upgrade when requested" do
+    1.temp_dirs do |repo|
+      initialize_git_repo(repo)
+      
+      Dir.chdir(repo) do
+        commit_a_migration "first table"
+        File.open(XMigra::SchemaManipulator::PERMISSIONS_FILE, 'w') do |grants_file|
+          YAML.dump(
+            {
+              "foo" => {
+                "alice" => "ALL",
+                "bob" => "SELECT",
+                "candace" => ["INSERT", "SELECT", "UPDATE"],
+              },
+            }, 
+            grants_file
+          )
+        end
+        
+        XMigra::SchemaUpdater.new('.').tap do |tool|
+          tool.include_grants = true
+          
+          sql = tool.update_sql
+          assert_include sql, /GRANT\s+ALL.*?alice/
+          assert_include sql, /GRANT\s+SELECT.*?bob/
+          assert_include sql, /GRANT\s+INSERT.*?candace/
+          assert_include sql, /GRANT.*?SELECT.*?candace/
+          assert_include sql, /GRANT.*?UPDATE.*?candace/
+        end
+      end
+    end
+  end
 end

data/test/new_files.rb

@@ -0,0 +1,14 @@
+
+XMigra::DatabaseSupportModules.each do |db_module|
+  ["migration", "index", "view", "function", "procedure"].each do |file_type_flag|
+    run_test "#{db_module::SYSTEM_NAME} support for new #{file_type_flag} file" do
+      in_xmigra_schema(:db_info=>{'system'=>db_module::SYSTEM_NAME}) do
+        begin
+          XMigra::Program.run(["new", "--no-edit", "--#{file_type_flag}", "foobarbaz"])
+        rescue XMigra::NewAccessArtifactAdder::UnsupportedArtifactType
+          # This is an acceptable error
+        end
+      end
+    end
+  end
+end

data/test/runner.rb

@@ -8,6 +8,8 @@ require 'tmpdir'
 TESTS = %w[
   git_vcs
   reversions
+  new_files
+  structure_declarative
 ]
 
 $:.unshift Pathname(__FILE__).expand_path.dirname.dirname + 'lib'
@@ -38,7 +40,13 @@ def run_test(name, &block)
   
   $test_count += 1
   
+  msg_receiver, msg_sender = IO.pipe
+  
   if child_pid = Process.fork
+    msg_sender.close
+    
+    # Must read to EOF or child may hang if pipe is filled
+    test_message = msg_receiver.read
     Process.wait(child_pid)
     
     if $?.success?
@@ -48,7 +56,14 @@ def run_test(name, &block)
       print 'F'
       $tests_failed << name
     end
+    
+    if test_message.length > 0
+      ($test_messages ||= {})[name] = test_message
+    end
+    msg_receiver.close
   else
+    msg_receiver.close
+    
     begin
       prev_stdout = $stdout
       $stdout = StringIO.new
@@ -59,11 +74,16 @@ def run_test(name, &block)
       end
       exit! 0
     rescue AssertionFailure
+      msg_sender.puts $!
       exit! 2
     rescue
-      puts
-      puts "Exception: #{$!}"
-      puts $!.backtrace
+      msg_sender.puts "#{$!.class}: #{$!}"
+      msg_sender.puts $!.backtrace
+      $!.each_causing_exception do |ex|
+        msg_sender.puts
+        msg_sender.puts "Caused by #{ex.class}: #{ex}"
+        msg_sender.puts ex.backtrace
+      end
       exit! 1
     end
   end
@@ -96,8 +116,25 @@ def assert_neq(actual, expected)
   assert(proc {"Value #{actual.inspect} was unexpected"}) {actual != expected}
 end
 
+def include_test(container, item)
+  case
+  when item.kind_of?(Regexp) && container.kind_of?(String)
+    item.match container
+  else
+    container.include? item
+  end
+end
+
 def assert_include(container, item)
-  assert(proc {"#{item.inspect} was not in #{container.inspect}"}) {container.include? item}
+  assert(proc {"#{item.inspect} was not in #{container.inspect}"}) do
+    include_test container, item
+  end
+end
+
+def assert_not_include(container, item)
+  assert(proc {"#{item.inspect} was in #{container.inspect}"}) do
+    !include_test container, item
+  end
 end
 
 def assert_raises(expected_exception)
@@ -155,3 +192,11 @@ puts
 puts "#{$test_successes}/#{$test_count} succeeded" if $test_options.show_counts
 puts "Failed tests:" unless $tests_failed.empty?
 $tests_failed.each {|name| puts "    #{name}"}
+
+($test_messages || {}).each_pair do |test_name, message|
+  puts
+  puts "----- #{test_name} -----"
+  message.each_line do |msg_line|
+    puts msg_line.chomp
+  end
+end