esr-rim 1.4.0 → 1.4.2

data/test/upload_module_helper_test.rb

@@ -1,92 +1,92 @@
-$:.unshift File.join(File.dirname(__FILE__),"..","lib")
-$:.unshift File.join(File.dirname(__FILE__))
-
-require 'minitest/autorun'
-require 'rim/git'
-require 'rim/dirty_check'
-require 'rim/module_info'
-require 'rim/rim_info'
-require 'rim/upload_module_helper'
-require 'test_helper'
-require 'fileutils'
-
-class UploadModuleHelperTest < Minitest::Test
-  include FileUtils
-  include TestHelper
-
-  def setup
-    @logger = Logger.new($stdout)
-    @logger.level = Logger::ERROR unless ARGV.include? "debug"
-    RIM::GitSession.logger = @logger
-    test_dir = empty_test_dir("upload_module_helper_test")
-    @remote_git_dir = File.join(test_dir, "remote_git")
-    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")
-      s.execute("git add .")
-      s.execute("git commit -m \"Initial commit\"")
-      s.execute("git checkout -B master")
-      write_file(@remote_git_dir, "readme2.txt")
-      s.execute("git add .")
-      s.execute("git commit -m \"Second commit\"")
-      s.execute("git checkout --detach master")
-      @initial_rev = s.rev_sha1("HEAD")
-    end
-    @ws_dir = File.join(test_dir, "ws")
-    FileUtils.mkdir(@ws_dir)
-    RIM::git_session(@ws_dir) do |s|
-      s.execute("git init")
-      `echo '.rim' >> #{File.join(@ws_dir, ".gitignore")}`
-      s.execute("git checkout -B master")
-      write_file(@ws_dir, "initial.txt")
-      s.execute("git add .")
-      s.execute("git commit -m \"Initial commit\"")
-      @initial_ws_rev = s.rev_sha1("HEAD")
-    end
-  end
-  
-  def teardown
-    remove_test_dirs
-  end
-
-  def test_files_are_uploaded_to_branch
-    mod_dir = File.join(@ws_dir, "module")
-    FileUtils.mkdir_p(mod_dir)
-    write_file(mod_dir, "readme.txt")
-    rim_info = RIM::RimInfo.new
-    rim_info.revision_sha1 = @initial_rev
-    rim_info.target_revision = "testbr"
-    rim_info.to_dir(mod_dir)
-    revs = []
-    RIM::git_session(@ws_dir) do |s|
-      s.execute("git add --all #{@ws_dir}")
-      s.execute("git commit -m \"Initial workspace commit\"")
-      write_file(@ws_dir, "nomodulefile.txt")
-      s.execute("git add --all #{@ws_dir}")
-      s.execute("git commit -m \"Added non module file\"")
-      revs.push(s.rev_sha1("HEAD"))
-      write_file(mod_dir, "second.txt")
-      s.execute("git add --all #{@ws_dir}")
-      s.execute("git commit -m \"Added module file\"")
-      revs.push(s.rev_sha1("HEAD"))
-    end
-    info = RIM::ModuleInfo.new("file://" + @remote_git_dir, "module", "testbr")
-    cut = RIM::UploadModuleHelper.new(@ws_dir, info, true, @logger)
-    cut.upload(nil, revs)
-    RIM::git_session(@remote_git_dir) do |s|
-      s.execute("git checkout testbr")
-    end
-    assert File.exists?(File.join(@remote_git_dir, "readme.txt"))
-    assert File.exists?(File.join(@remote_git_dir, "second.txt"))
-  end
-
-  def write_file(dir, name)
-    FileUtils.mkdir_p(dir)
-    File.open(File.join(dir, name), "w") do |f| 
-      f.write("Content of #{name}\n") 
-    end
-  end
-  
-end
+$:.unshift File.join(File.dirname(__FILE__),"..","lib")
+$:.unshift File.join(File.dirname(__FILE__))
+
+require 'minitest/autorun'
+require 'rim/git'
+require 'rim/dirty_check'
+require 'rim/module_info'
+require 'rim/rim_info'
+require 'rim/upload_module_helper'
+require 'test_helper'
+require 'fileutils'
+
+class UploadModuleHelperTest < Minitest::Test
+  include FileUtils
+  include TestHelper
+
+  def setup
+    @logger = Logger.new($stdout)
+    @logger.level = Logger::ERROR unless ARGV.include? "debug"
+    RIM::GitSession.logger = @logger
+    test_dir = empty_test_dir("upload_module_helper_test")
+    @remote_git_dir = File.join(test_dir, "remote_git")
+    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")
+      s.execute("git add .")
+      s.execute("git commit -m \"Initial commit\"")
+      s.execute("git checkout -B master")
+      write_file(@remote_git_dir, "readme2.txt")
+      s.execute("git add .")
+      s.execute("git commit -m \"Second commit\"")
+      s.execute("git checkout --detach master")
+      @initial_rev = s.rev_sha1("HEAD")
+    end
+    @ws_dir = File.join(test_dir, "ws")
+    FileUtils.mkdir(@ws_dir)
+    RIM::git_session(@ws_dir) do |s|
+      s.execute("git init")
+      `echo '.rim' >> #{File.join(@ws_dir, ".gitignore")}`
+      s.execute("git checkout -B master")
+      write_file(@ws_dir, "initial.txt")
+      s.execute("git add .")
+      s.execute("git commit -m \"Initial commit\"")
+      @initial_ws_rev = s.rev_sha1("HEAD")
+    end
+  end
+  
+  def teardown
+    remove_test_dirs
+  end
+
+  def test_files_are_uploaded_to_branch
+    mod_dir = File.join(@ws_dir, "module")
+    FileUtils.mkdir_p(mod_dir)
+    write_file(mod_dir, "readme.txt")
+    rim_info = RIM::RimInfo.new
+    rim_info.revision_sha1 = @initial_rev
+    rim_info.target_revision = "testbr"
+    rim_info.to_dir(mod_dir)
+    revs = []
+    RIM::git_session(@ws_dir) do |s|
+      s.execute("git add --all #{@ws_dir}")
+      s.execute("git commit -m \"Initial workspace commit\"")
+      write_file(@ws_dir, "nomodulefile.txt")
+      s.execute("git add --all #{@ws_dir}")
+      s.execute("git commit -m \"Added non module file\"")
+      revs.push(s.rev_sha1("HEAD"))
+      write_file(mod_dir, "second.txt")
+      s.execute("git add --all #{@ws_dir}")
+      s.execute("git commit -m \"Added module file\"")
+      revs.push(s.rev_sha1("HEAD"))
+    end
+    info = RIM::ModuleInfo.new("file://" + @remote_git_dir, "module", "testbr")
+    cut = RIM::UploadModuleHelper.new(@ws_dir, info, true, @logger)
+    cut.upload(nil, revs)
+    RIM::git_session(@remote_git_dir) do |s|
+      s.execute("git checkout testbr")
+    end
+    assert File.exists?(File.join(@remote_git_dir, "readme.txt"))
+    assert File.exists?(File.join(@remote_git_dir, "second.txt"))
+  end
+
+  def write_file(dir, name)
+    FileUtils.mkdir_p(dir)
+    File.open(File.join(dir, name), "w") do |f| 
+      f.write("Content of #{name}\n") 
+    end
+  end
+  
+end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: esr-rim
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.2
 platform: ruby
 authors:
 - ESR Labs AG
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-15 00:00:00.000000000 Z
+date: 2018-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: subcommand
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.6
 description: RIM lets you work with multiple git repositories from within one single
@@ -69,9 +69,6 @@ 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
@@ -79,9 +76,6 @@ 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
@@ -95,25 +89,25 @@ licenses: []
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --main
+- "--main"
 - README.md
-- -x
+- "-x"
 - test
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: RIM - multi git tool

data/test/dirty_check/dir1/file2

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

data/test/dirty_check/file1

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

data/test/dirty_check/ign_file1

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

data/test/rim_info/mod1/dir1/file2

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

data/test/rim_info/mod1/file1

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

data/test/rim_info/unrelated_file

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