esr-rim 1.3.6 → 1.3.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MWUzYjVhOGMyZDNmZWUwOGYwYmIxZjdhNjAzOWFmZWYxNGVmNTNiMA==
+    MTIwZTVjMGFiNmQ3YjdmNmJmY2NmYTVkMzk2ODY2YzBkMjEwZDQ5YQ==
   data.tar.gz: !binary |-
-    NTk4MjAwMTExNWQ5ZDgzODVjOWIzYjFmZTk2YTVlNTc5MjZiZWUyOQ==
+    MmU3YmU2NTA2OGZmYzI1Yjg0Y2ExYWFjN2MwNGExYjIzMmY0ZWZhNw==
 SHA512:
   metadata.gz: !binary |-
-    NDY2Y2NmNjEzZGNkMWQ1ZTViMTBlYjRiOWRmN2Q3NDc5YmI3ZjYzNTc1ZjZl
-    MDcwOWVlNTJhNzI5MzVhYmI5ZWJjODhhZjFlYzIxNWIzMWZhZmE2M2I5ZDQ2
-    OGE1NzY5MmI2N2JkZGVmOTVkNTQ3NmMwYmQxNzBhODQyMzNjYWM=
+    ZjViYzhkNTgxMDM2ZWZlMDAxM2IxZGYzOGVjZWFhODFmNGI3OGI3OTlmYjZl
+    YWQ2MTE2NGY3ZDBjMTRjOGQ1MjA0NmQ4NjhmODA4NWM0NTVkYzlmN2ZiNzk4
+    NmRiMDliMDFjZTMwMGNiNWIwODVkNjVjZGNlMzI3MTMyYzlkM2M=
   data.tar.gz: !binary |-
-    OWNlNmUzYTk4Y2MyMGU2ZjYyODRmZTM3YTEzNGFjNjc4YjFkOTg4ZmZjMTVl
-    MDFjOTAyODQwMzExMzA5NDcwZWQzNWUzZjQyOWMwYzk3NmYzOGJkZjRkMzAw
-    ZGIyYWJlOGM4MmQwYjRjYzcxYTA3MjJkZTkyYmRmNmQ1ODhmYWM=
+    MGI3ODk5ZGEyYmJiZmVhMzE1ZmIxMTgyOGE0OTc5MjVkNWVjYzY4NTM0YjNh
+    M2JjZjExMzk1MzA2ODdhMWZlYjNkODU1NzM4Zjc3MTI1ZDBiNjllMTNmNWFl
+    NjE3ZWNlMTVhZWQ1NjBmZjUwMmZmYjg4OWVkNWQ1YzNlNzI3NDk=

data/CHANGELOG

@@ -109,3 +109,9 @@
 * Normalize path set in RIM_HOME before using (fixes problems with backslash used in Windows).
 * Use SHA1 for shortened paths only if shorter than original path.
 * Set RIM_HOME to non-persistent path for unit tests.
+
+# 1.3.7
+
+* fixed Issue #18: rim can't sync commits containing ignored files
+
+

data/lib/rim/sync_module_helper.rb

@@ -61,15 +61,14 @@ module RIM
     def needs_commit?(session)
       # do we need to commit something?
       stat = session.status(@module_info.local_path)
-      ignored = stat.lines.select{ |l| l.ignored? }
+      # no files should be ignored due to --force option. Anyway we will check for ignored files
+      ignored = []
+      session.execute("git add --all --force #{@module_info.local_path}") do |out, e|
+        ignored = parse_ignored_files(session, out, e)
+      end
       if ignored.empty?
-        session.execute("git add --all #{@module_info.local_path}") do |out, e|
-          ignored = parse_ignored_files(session, out, e)
-        end
-        if ignored.empty?
-          stat = session.status(@module_info.local_path)
-          ignored = stat.lines.select{ |l| l.ignored? }
-        end
+        stat = session.status(@module_info.local_path)
+        ignored = stat.lines.select{ |l| l.ignored? }
       end
       if !ignored.empty?
         messages = ["Sync failed due to files/dirs of #{@module_info.local_path} which are ignored by workspace's .gitignore:"]

data/lib/rim/version.rb

@@ -2,7 +2,7 @@ module RIM
 
 module Version
 
-Version = "1.3.6"
+Version = "1.3.7"
 
 end
 

data/test/sync_module_helper_test.rb

@@ -18,20 +18,20 @@ class SyncModuleHelperTest < Minitest::Test
     @logger.level = Logger::ERROR unless ARGV.include? "debug"
     RIM::GitSession.logger = @logger
     test_dir = empty_test_dir("module_sync_helper_test")
-    remote_git_dir = File.join(test_dir, "remote_git")
-    @remote_git_dir = "file://" + remote_git_dir
-    FileUtils.mkdir(remote_git_dir)
-    RIM::git_session(remote_git_dir) do |s|
+    @remote_git_dir = File.join(test_dir, "remote_git")
+    @remote_git_dir_url = "file://" + @remote_git_dir
+    FileUtils.mkdir(@remote_git_dir)
+    RIM::git_session(@remote_git_dir) do |s|
       s.execute("git init")
       s.execute("git checkout -B testbr")
-      write_file(remote_git_dir, "readme.txt")
+      write_file(@remote_git_dir, "readme.txt")
       s.execute("git add .")
       s.execute("git commit -m \"Initial commit\"")
     end
     @ws_dir = File.join(test_dir, "ws")
     FileUtils.mkdir(@ws_dir)
     RIM::git_session(@ws_dir) do |s|
-      s.execute("git clone #{@remote_git_dir} .")
+      s.execute("git clone #{@remote_git_dir_url} .")
     end
   end
   
@@ -40,13 +40,43 @@ class SyncModuleHelperTest < Minitest::Test
   end
 
   def test_files_are_copied_to_working_dir
-    info = RIM::ModuleInfo.new(@remote_git_dir, "test", "testbr")
+    info = RIM::ModuleInfo.new(@remote_git_dir_url, "test", "testbr")
     cut = RIM::SyncModuleHelper.new(@ws_dir, @ws_dir, info, @logger)
     cut.sync
     assert File.exists?(File.join(@ws_dir, "test/readme.txt"))
     assert File.exists?(File.join(@ws_dir, "test/.riminfo"))
   end
 
+  def test_files_ignored_by_gitignore_of_workspace_are_copied_to_working_dir
+    RIM::git_session(@remote_git_dir) do |s|
+      write_file(@remote_git_dir, 'ignored_file.txt')
+      s.execute("git add .")
+      s.execute("git commit -m \"Add a single file\"")
+    end
+    RIM::git_session(@ws_dir) do |s|
+      write_file(@ws_dir, '.gitignore', 'ignored*\n')
+      s.execute("git add .")
+      s.execute("git commit -m \"Ignore a single file\"")
+    end
+    info = RIM::ModuleInfo.new(@remote_git_dir_url, "test", "testbr")
+    cut = RIM::SyncModuleHelper.new(@ws_dir, @ws_dir, info, @logger)
+    cut.sync
+    assert File.exists?(File.join(@ws_dir, "test/readme.txt"))
+    assert File.exists?(File.join(@ws_dir, "test/.riminfo"))
+    assert File.exists?(File.join(@ws_dir, "test/ignored_file.txt"))
+    # Add a single ignored file afterwards and sync again
+    RIM::git_session(@remote_git_dir) do |s|
+      write_file(@remote_git_dir, 'ignored_file_2.txt')
+      s.execute("git add .")
+      s.execute("git commit -m \"Add a second ignored file\"")
+    end
+    cut.sync
+    assert File.exists?(File.join(@ws_dir, "test/readme.txt"))
+    assert File.exists?(File.join(@ws_dir, "test/.riminfo"))
+    assert File.exists?(File.join(@ws_dir, "test/ignored_file.txt"))
+    assert File.exists?(File.join(@ws_dir, "test/ignored_file_2.txt"))
+  end
+
   def test_files_of_ignore_list_are_not_removed_when_copying
     test_folder = File.join(@ws_dir, "test")
     write_file(test_folder, "file1")
@@ -54,7 +84,7 @@ class SyncModuleHelperTest < Minitest::Test
     write_file(File.join(test_folder, "folder"), "file1")
     write_file(File.join(test_folder, "folder"), "file2")
     write_file(File.join(test_folder, "folder2"), "file1")
-    info = RIM::ModuleInfo.new(@remote_git_dir, "test", "testbr", "**/file2")
+    info = RIM::ModuleInfo.new(@remote_git_dir_url, "test", "testbr", "**/file2")
     cut = RIM::SyncModuleHelper.new(@ws_dir, @ws_dir, info, @logger)
     cut.sync
     assert File.exists?(File.join(test_folder, "readme.txt"))
@@ -67,7 +97,7 @@ class SyncModuleHelperTest < Minitest::Test
   end
 
   def test_commit_message_is_set_by_default
-    info = RIM::ModuleInfo.new(@remote_git_dir, "test", "testbr")
+    info = RIM::ModuleInfo.new(@remote_git_dir_url, "test", "testbr")
     cut = RIM::SyncModuleHelper.new(@ws_dir, @ws_dir, info, @logger)
     cut.sync
     RIM::git_session(@ws_dir) do |s|
@@ -77,7 +107,7 @@ class SyncModuleHelperTest < Minitest::Test
   end
 
   def test_commit_message_can_be_changed
-    info = RIM::ModuleInfo.new(@remote_git_dir, "test", "testbr")
+    info = RIM::ModuleInfo.new(@remote_git_dir_url, "test", "testbr")
     cut = RIM::SyncModuleHelper.new(@ws_dir, @ws_dir, info, @logger)
     cut.sync("This is the commit header.")
     RIM::git_session(@ws_dir) do |s|
@@ -86,10 +116,10 @@ class SyncModuleHelperTest < Minitest::Test
     end
   end
 
-  def write_file(dir, name)
+  def write_file(dir, name, content = nil)
     FileUtils.mkdir_p(dir)
     File.open(File.join(dir, name), "w") do |f| 
-      f.write("Content of #{name}\n") 
+      f.write(content || "Content of #{name}\n") 
     end
   end
   

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: esr-rim
 version: !ruby/object:Gem::Version
-  version: 1.3.6
+  version: 1.3.7
 platform: ruby
 authors:
 - ESR Labs AG
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-08 00:00:00.000000000 Z
+date: 2016-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: subcommand