esr-rim 1.3.9 → 1.4.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzMzYjRlMWZiZWE5YmFiMGYzMjI1YWEzODczMTU1N2I4YWIxYmVjOQ==
+    ZTAxYjg0NjcxMmVhMThhNTA4MWI0ZDU0YzQxZGEzNmQ3NzJkYWM0Yg==
   data.tar.gz: !binary |-
-    YTY4NGY4M2MwNTJmYTI0ZGUzMWY5N2IzNTliYTQ4YzNiNDhmMzdmZQ==
+    MWFjMjVhMTY4YzYyNGQxMTRmNDVlNzU1ZjNiOTdiZmMyOGYzODZmNQ==
 SHA512:
   metadata.gz: !binary |-
-    MGY0YzQ3NjU2ODJhNTg0OTk0MmM4NTRjOGZhZmQxMTYxOGNkZWJhNDc0YzM2
-    OGIzOTFhMTAyZjYxNmJlZGQwYWYzMTY5NDBkMjY1MDYxZjVhYzUyMzEzMGU1
-    MmVkNjAzMjkyMjVlZTY5NGQ2OGQ2ZDViZDIzNGVhYmM3NzE5OGM=
+    MGJlMTY3YTQ1N2Y1MjllOTVmZjZjNzM5NGM0M2FjYjMxYWI4MzNiM2VlZWU3
+    Y2VmNDNkMGJjODNmYzU1M2E0ZmMxMWM3ODgxOTAxNWI2M2VjZDRlNmJkMGFk
+    MGQ1NTE3YTI4MmFhYjk4NDBmNzYzODk3NmE3ZTkzYTJiZjU3N2Y=
   data.tar.gz: !binary |-
-    NjdmZjM2ODc4MWMwNTc1YTlmZGM2NjRlODg2NTI4MGNlOTFhYmU1NWRhZWYx
-    OWIyZTE5NmYyN2JhYjhhOGE2MmE5YWY1YjY0MGI2ZmEwOTkzN2QyZWQ3YjBk
-    ZjZiNTRjMmJkYjc4YWFjMWI1NWM1NTI1OWY2MzFmOTYzY2JlMTE=
+    NTg0MzcxODM3YjQyYjVjM2JjY2I1N2ZiMDZmNDZlZTI0YjM3NWM2YjA1NmY2
+    YmQzYjdhNzE1MWFjNTI4NmI3ZjIyYzc1ZTRlZGM0YjYyYzgxMWYzY2FkZDc3
+    YmExNjgxZDI0ZjEyOTE0MjkyMDY1YzFmNjJlODczNGY3NTkxMmE=

data/CHANGELOG

@@ -122,3 +122,7 @@
 # 1.3.9
 
 * Changed handling of parallel tasks due to robustness problems
+
+# 1.4.0
+
+* fixed Issue #20: Add revision timestamp to .riminfo

data/lib/rim/git.rb

@@ -144,6 +144,17 @@ class GitSession
     end
     sha1
   end
+
+  # returns some informations about a revision
+  def rev_infos(rev, desired)
+    info = {}
+    desired.each_pair do |key, value|
+      execute "git log -1 --format=#{value} #{rev} --" do |out, e|
+        info[key] = out.strip if !e
+      end
+    end
+    info
+  end
   
   # returns the SHA-1 representations of the heads of all remote branches
   def remote_branch_revs

data/lib/rim/processor.rb

@@ -22,7 +22,7 @@ def initialize(workspace_root, logger)
   rim_dir = File.join(File.expand_path(ENV['HOME']), ".rim") if rim_dir.nil? && ENV.has_key?('HOME')
   if rim_dir
     @rim_path = File.join(rim_dir, Processor.shorten_path(@ws_root))
-  else
+  else  
     @rim_path = File.join(@ws_root, ".rim")
   end
   @logger = logger

data/lib/rim/rim_info.rb

@@ -36,6 +36,12 @@ class RimInfo
     attr_accessor d
   end
 
+  @@git_infos = {
+    :committer_date => "%ci"
+  }
+
+  attr_accessor :infos
+
   def self.exists?(dir)
     File.exist?(info_file(dir))
   end
@@ -52,6 +58,10 @@ class RimInfo
     mi
   end
 
+  def self.git_infos
+    @@git_infos
+  end
+
   def dirty?
     @dirty
   end
@@ -81,6 +91,12 @@ class RimInfo
     AttrsDef.each do |a|
       send("#{a}=".to_sym, attrs[a])
     end
+    @@git_infos.each_pair do |key, value|
+      if attrs.has_key?(key)
+        @infos ||= {}
+        @infos[key] = attrs[key]
+      end
+    end
     @dirty = checksum != calc_sha1(content)
   end
 
@@ -110,10 +126,18 @@ class RimInfo
   end
 
   def to_s
-    max_len = AttrsDef.collect{|a| a.size}.max
-    AttrsDef.collect { |a|
+    i = @infos || {}
+    max_len = (AttrsDef + i.keys).collect{|a| a.size}.max
+    s = AttrsDef.collect { |a|
       "#{a.to_s.ljust(max_len)}: #{send(a)}"
     }.join("\n")
+    if !i.empty?
+      s << "\n\n"
+      i.each_pair { |key, value| 
+        s << "#{key.to_s.ljust(max_len)}: #{value.to_s}\n"
+      }
+    end
+    s
   end
 
   private

data/lib/rim/sync_module_helper.rb

@@ -47,6 +47,7 @@ module RIM
           @rim_info.revision_sha1 = sha1
           @rim_info.ignores = @module_info.ignores.join(",")
           @rim_info.subdir = @module_info.subdir
+          @rim_info.infos = s.rev_infos(@module_info.target_revision, RimInfo.git_infos)
           @rim_info.to_dir(local_path)
           DirtyCheck.mark_clean(local_path)
         end

data/lib/rim/version.rb

@@ -2,7 +2,7 @@ module RIM
 
 module Version
 
-Version = "1.3.9"
+Version = "1.4.0"
 
 end
 

data/test/dirty_check/dir1/file2

@@ -0,0 +1 @@
+more content

data/test/dirty_check/file1

@@ -0,0 +1 @@
+some content

data/test/dirty_check/ign_file1

@@ -0,0 +1 @@
+ignored stuff

data/test/rim_info/mod1/dir1/file2

@@ -0,0 +1 @@
+some other content

data/test/rim_info/mod1/file1

@@ -0,0 +1 @@
+some content

data/test/rim_info/unrelated_file

@@ -0,0 +1 @@
+anything

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: esr-rim
 version: !ruby/object:Gem::Version
-  version: 1.3.9
+  version: 1.4.0
 platform: ruby
 authors:
 - ESR Labs AG
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-24 00:00:00.000000000 Z
+date: 2017-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: subcommand
@@ -69,6 +69,9 @@ files:
 - lib/rim/upload_module_helper.rb
 - lib/rim/version.rb
 - test/command_helper_test.rb
+- test/dirty_check/dir1/file2
+- test/dirty_check/file1
+- test/dirty_check/ign_file1
 - test/dirty_check_test.rb
 - test/file_helper_test.rb
 - test/git_test.rb
@@ -76,6 +79,9 @@ files:
 - test/manifest_test_dir/manifest.rim
 - test/manifest_test_dir/subdir/only_to_keep_folder_in_git.txt
 - test/processor_test.rb
+- test/rim_info/mod1/dir1/file2
+- test/rim_info/mod1/file1
+- test/rim_info/unrelated_file
 - test/rim_info_test.rb
 - test/status_builder_test.rb
 - test/sync_helper_test.rb