roger 1.9.0 → 1.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69986cc9095a927deaa4d0c24ded5939d2ed1ea5373a2e3646af631bf0601c50
-  data.tar.gz: e2fa26c7a1aed9f93fa55b236acbbd7ecece390c615978c3bf3cc5867621743a
+  metadata.gz: 6071a3c717f18dc4886723a0614e5ef650efb9e1147c3b14f2cbdb88e2b8f66a
+  data.tar.gz: 39d6a8f3f1bf2dbb762ae3dbc09c5ece10d134557142aa48734565f18d915eb4
 SHA512:
-  metadata.gz: 43991d9924c031c0ffae6f413d4a32186c09ad5e4fd64187ca528b97f227b3fa7db5f47476d4b2667900a83516bb20cbcd973165b3cf98b814f06afeb582753d
-  data.tar.gz: 87cb05672e3960e1c8ca8622af06bcf360e0ddebe73d56ce81a6b3122bacf8d7eff4ec9972bec9fdfe35f2e5e1c4cfbbbaf53f902ac20c3fa508d181b404a9e3
+  metadata.gz: 26d5bb54c66be7aad6bf1a7446108fd6c546ee6f08161f36256b7eb00ed7183799bb82a25c182aacf7d66560690b59e41761580464f16a7bddb25ba9008ab9b0
+  data.tar.gz: 4f226bb86eb4ba2514889cd67337f02eefbdb997c3a5edfc1226d801f37e8ae88c7a06a0d6d3e32a8a6f9568d35c6eb0bcd78c13b9fc6e50ec496b2668069328

data/.rubocop.yml

@@ -32,6 +32,9 @@ Style/ClassAndModuleChildren:
 Style/SymbolArray:
   Enabled: false
 
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
 # By default, the rails cops are not run. Override in project or home
 # directory .rubocop.yml files, or by giving the -R/--rails option.
 Rails:

data/.travis.yml

@@ -1,7 +1,8 @@
 language: ruby
 rvm:
-  - 2.3.7
-  - 2.5.1
+  - 2.3.8
+  - 2.5.3
+  - 2.6.1
   - ruby-head
 before_script:
   - git config --global user.email "travis-ci@digitpaint.nl"

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## Version 1.9.1
+* Make Roger work on Windows (except the rsync finalizer)
+
 ## Version 1.9.0
 * Render all *.erb files by default
 * Update dependencies

data/azure-pipelines.yml

@@ -0,0 +1,31 @@
+# Ruby
+# Package your Ruby application.
+# Add steps that install rails, analyze code, save build artifacts, deploy, and more:
+# https://docs.microsoft.com/vsts/pipelines/languages/ruby
+
+pool:
+  vmImage: 'vs2017-win2016'
+
+steps:
+- task: UseRubyVersion@0
+  inputs:
+    versionSpec: '>= 2.5'
+
+- script: choco install zip -y
+  displayName: 'Install zip command using chocolatey'
+
+- script: |
+    git config --global user.email "foo@example.com"
+    git config --global user.name "Foo Bar"
+  displayName: 'Configure Git for tests that call out to Git'
+
+- script: gem install bundler
+  displayName: 'gem install bundler'
+
+- script: |
+    bundle install --retry=3 --jobs=4
+  displayName: 'bundle install'
+
+- script: bundle exec rake
+  displayName: 'bundle exec rake'
+

data/lib/roger/release/finalizers/git_branch.rb

@@ -58,15 +58,15 @@ module Roger::Release::Finalizers
         FileUtils.cp_r @release.build_path.to_s + "/.", clone_dir.to_s
 
         commands = [
-          %w(git add .), # 4. Add all files
-          %w(git commit -q -a -m) << "Release #{@release.scm.version}" # 5. Commit
+          "git add .", # 4. Add all files
+          %(git commit -q -m "Release #{Shellwords.escape(release.scm.version)}") # 5. Commit
         ]
 
         # 6. Git push if in options
-        commands << (%w(git push origin) << branch) if @options[:push]
+        commands << ("git push origin" << Shellwords.escape(branch)) if @options[:push]
 
         commands.each do |command|
-          `#{Shellwords.join(command)}`
+          `#{command}`
         end
       end
     end

data/lib/roger/release/scm/git.rb

@@ -50,12 +50,12 @@ module Roger
 
         def get_previous_tag_name
           # Get list of SHA1 that have a ref
-          sha1s = `git --git-dir=#{safe_git_dir} log --pretty='%H' --simplify-by-decoration`
+          sha1s = `git --git-dir=#{safe_git_dir} log --pretty="%H" --simplify-by-decoration`
           sha1s = sha1s.split("\n")
           tags = []
           while tags.size < 2 && sha1s.any?
             sha1 = sha1s.shift
-            tag = `git --git-dir=#{safe_git_dir} describe --tags --exact-match #{sha1} 2>/dev/null`
+            tag = `git --git-dir=#{safe_git_dir} describe --tags --exact-match #{sha1}`
             tag = tag.strip
             tags << tag unless tag.empty?
           end
@@ -84,11 +84,11 @@ module Roger
         def scm_version(ref)
           return nil unless File.exist?(git_dir)
 
-          version = `git --git-dir=#{safe_git_dir} describe --tags #{ref} 2>&1`
+          version = `git --git-dir=#{safe_git_dir} describe --tags #{ref}`
 
-          if $CHILD_STATUS.to_i > 0
+          if $CHILD_STATUS.to_i.positive?
             # HEAD is not a tagged version, get the short SHA1 instead
-            version = `git --git-dir=#{safe_git_dir} show #{ref} --format=format:"%h" -s 2>&1`
+            version = `git --git-dir=#{safe_git_dir} show #{ref} --format=format:"%h" -s`
           else
             # HEAD is a tagged version, if version is prefixed with "v" it will be stripped off
             version.gsub!(/^v/, "")
@@ -105,7 +105,7 @@ module Roger
           return nil unless File.exist?(git_dir)
 
           # Get the date in epoch time
-          date = `git --git-dir=#{safe_git_dir} show #{ref} --format=format:"%ct" -s 2>&1`
+          date = `git --git-dir=#{safe_git_dir} show #{ref} --format=format:"%ct" -s`
           Time.at(date.to_i) if date =~ /\d+/
         rescue RuntimeError
           nil

data/lib/roger/renderer.rb

@@ -79,7 +79,7 @@ module Roger
       # .html.erb will look at .html
       def mime_type_from_sub_extension(path)
         parts = File.basename(path.to_s).split(".")
-        MIME::Types.type_for(parts[0..-2].join(".")).first if parts.size > 2
+        MIME::Types.type_for(parts[0..-2].join(".")).sort.first if parts.size > 2
       end
     end
 

data/lib/roger/resolver.rb

@@ -217,7 +217,7 @@ module Roger
       relative_to = Pathname.new(File.dirname(relative_to.to_s))
 
       # If relative_to is an absolute path
-      if relative_to.to_s =~ %r{\A/}
+      if relative_to.absolute?
         relative_to = relative_to.relative_path_from(base).cleanpath
       end
 

data/lib/roger/server.rb

@@ -140,7 +140,7 @@ module Roger
       Addrinfo.tcp(host, port).listen.close
 
       true
-    rescue SocketError, Errno::EADDRINUSE
+    rescue SocketError, Errno::EADDRINUSE, Errno::EACCES
       false
     end
 

data/lib/roger/version.rb

@@ -1,4 +1,4 @@
 # Roger main namespace
 module Roger
-  VERSION = "1.9.0".freeze
+  VERSION = "1.9.1".freeze
 end

data/test/unit/generators/new_test.rb

@@ -48,7 +48,8 @@ module Roger
         c.directory "template" do |t|
           system("git init -q")
           t.file "gitone"
-          system("git add gitone; git commit -q -am 'test'")
+          system("git add gitone")
+          system("git commit -q -am 'test'")
         end
 
         git_path = "file://#{c + 'template/.git'}"

data/test/unit/release/finalizers/rsync_test.rb

@@ -17,6 +17,9 @@ module Roger
 
       # A target dir
       @target_path = setup_construct(chdir: false)
+
+      omit("Skipping rsync test on Windows") if RUBY_PLATFORM.match("mswin") ||
+                                                RUBY_PLATFORM.match("mingw")
     end
 
     # called after every single test

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roger
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.9.1
 platform: ruby
 authors:
 - Flurin Egger
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-24 00:00:00.000000000 Z
+date: 2019-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -185,6 +185,7 @@ files:
 - MIT_LICENSE
 - README.md
 - Rakefile
+- azure-pipelines.yml
 - bin/roger
 - doc/cli.md
 - doc/images/logo_black-yellow.png
@@ -356,7 +357,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: Roger is a set of tools to create self-containing HTML mockups.