fedux_org-stdlib 0.6.40 → 0.6.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93d303a2d7b9dace940e87dcbb888ded268856f9
-  data.tar.gz: c9ac2d463177025b2e9e8117059e42600d662845
+  metadata.gz: d70df22862cf89bde4bef5464ceaab686e727549
+  data.tar.gz: 4f615986ce1f3a5a04307bf2b2a1af55bc282141
 SHA512:
-  metadata.gz: b05ae79b60a72cfc8c41859c5f046aeba1958df6799c46b32a2918c5c5c109c2f4cdfd875d182d3b1d27d983a08ff3b7c4ad13f27952f2892fc5235a05c84f31
-  data.tar.gz: d000420eee51aa81424817a2f42bbad8ce92b2493d7d5d064a035246ea4cc141ff12362c52067d5d770189919d64df579dd168914462da062ce0665010815e75
+  metadata.gz: 2adf3d393744ebdfafc5ba57ee182d9f4831a495de6d2a1b017aea791aac1358958e83ae43f55af660f25c9fdc0b9472ca03d6a4da3ccda6b1c43dd6e2da2a57
+  data.tar.gz: f8a609875743f1eb60222405ff879d83fed7c92b6edf7161ac9bf0f6ecbe25e230f609e514f1c71fbf701f11bf9647966d3d86465997d4a4c82dba7238104c33

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fedux_org-stdlib (0.6.39)
+    fedux_org-stdlib (0.6.42)
       activesupport
 
 GEM

data/lib/fedux_org_stdlib/core_ext/hash/options.rb

@@ -1,4 +1,7 @@
 # encoding: utf-8
+require 'shellwords'
+require 'fedux_org_stdlib/core_ext/shellwords/clean'
+
 class Hash
   # Convert hash to command line options
   #
@@ -28,15 +31,35 @@ class Hash
   #
   #   hash.to_options
   #   # => [ '--opt1', 'string']
+  #
+  # @example Clean keys
+  #
+  #   hash = {
+  #     '$opt1' => 'string'
+  #   }
+  #
+  #   hash.to_options
+  #   # => [ '--opt1', 'string']
+  #
+  # @example Escape values
+  #
+  #   hash = {
+  #     'opt1' => '$string'
+  #   }
+  #
+  #   hash.to_options
+  #   # => [ '--opt1', '\$string']
   def to_options
     each_with_object([]) do |(key, value), a|
+      key = Shellwords.clean(key)
+
       if value.is_a? TrueClass
         a << "--#{key}"
       elsif value.is_a? FalseClass
         a << "--no-#{key}"
       else
         a << "--#{key}"
-        a << value.to_s
+        a << Shellwords.escape(value)
       end
     end
   end

data/lib/fedux_org_stdlib/core_ext/shellwords/clean.rb

@@ -0,0 +1,11 @@
+# encoding: utf-8
+require 'shellwords'
+
+module Shellwords
+  class << self
+    def shellclean(string)
+      shellescape(string).gsub(/\\./, '')
+    end
+    alias_method :clean, :shellclean
+  end
+end

data/lib/fedux_org_stdlib/file_template.rb

@@ -210,8 +210,16 @@ module FeduxOrgStdlib
       ext.any? { |e| e == extname }
     end
 
+    def proposed_file_name
+      template_name
+    end
+
     public
 
+    def proposed_file
+      File.join working_directory, proposed_file_name
+    end
+
     def proposed_extname
       ext = File.extname(basename)
 

data/lib/fedux_org_stdlib/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 # FeduxOrgStdlib
 module FeduxOrgStdlib
-  VERSION = '0.6.40'
+  VERSION = '0.6.43'
 end

data/spec/app_config_spec.rb

@@ -44,9 +44,11 @@ RSpec.describe AppConfig do
         config = config_klass.new
         expect(config.opt1).to be_nil
 
-        expect {
-          config.opt1 = 'blub'
-        }.to raise_error NoMethodError
+        silence :stderr do
+          expect {
+            config.opt1 = 'blub'
+          }.to raise_error NoMethodError
+        end
       end
     end
 

data/spec/core_ext/hash/options_spec.rb

@@ -48,4 +48,28 @@ RSpec.describe '#to_options' do
 
     expect(hash.to_options).to eq %w{ --opt1 string }
   end
+
+  it 'handles umlauts as well' do
+    hash = { 
+      "öäopt1" => 'string'
+    }
+
+    expect(hash.to_options).to eq %w{ --opt1 string }
+  end
+
+  it 'handles special characters as well' do
+    hash = { 
+      "$o p\tt1" => 'string'
+    }
+
+    expect(hash.to_options).to eq %w{ --opt1 string }
+  end
+
+  it 'handles special characters in value as well' do
+    hash = { 
+      opt1: 'string$string string'
+    }
+
+    expect(hash.to_options).to eq ['--opt1', 'string\$string\ string']
+  end
 end

data/spec/core_ext/shellwords/clean_spec.rb

@@ -0,0 +1,23 @@
+# encoding: utf-8
+require 'spec_helper'
+require 'fedux_org_stdlib/core_ext/shellwords/clean'
+
+RSpec.describe '.shellclean' do
+  it 'returns a normal string as normal string' do
+    result = Shellwords.clean('asdf')
+
+    expect(result).to eq 'asdf'
+  end
+
+  it 'removes whitespace' do
+    result = Shellwords.clean("asdf asdf\tasdf")
+
+    expect(result).to eq 'asdfasdfasdf'
+  end
+
+  it 'removes $' do
+    result = Shellwords.clean("asdf$asdf")
+
+    expect(result).to eq 'asdfasdf'
+  end
+end

data/spec/template_file_spec.rb

@@ -3,6 +3,26 @@ require 'spec_helper'
 require 'fedux_org_stdlib/file_template'
 
 RSpec.describe FileTemplate do
+
+  context '#proposed_file' do
+    it 'generates a propose file path based on template basename' do
+      with_environment 'HOME' => working_directory do
+        template_klass = Class.new(FileTemplate) do
+          def class_name
+            'TestTemplate'
+          end
+
+          def module_name
+            'MyApplication'
+          end
+        end
+
+        template = template_klass.new(working_directory: working_directory)
+        expect(template.proposed_file).to eq File.join(working_directory, 'test')
+      end
+    end
+  end
+
   context '#preferred_template_file' do
     it 'has a default template file which is the preferred place to store the template' do
       with_environment 'HOME' => working_directory do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fedux_org-stdlib
 version: !ruby/object:Gem::Version
-  version: 0.6.40
+  version: 0.6.43
 platform: ruby
 authors:
 - Max Meyer
@@ -58,6 +58,7 @@ files:
 - lib/fedux_org_stdlib/command/which.rb
 - lib/fedux_org_stdlib/core_ext/array.rb
 - lib/fedux_org_stdlib/core_ext/hash/options.rb
+- lib/fedux_org_stdlib/core_ext/shellwords/clean.rb
 - lib/fedux_org_stdlib/core_ext/string.rb
 - lib/fedux_org_stdlib/environment.rb
 - lib/fedux_org_stdlib/file_template.rb
@@ -139,6 +140,7 @@ files:
 - spec/command/run_command_spec.rb
 - spec/command/which_spec.rb
 - spec/core_ext/hash/options_spec.rb
+- spec/core_ext/shellwords/clean_spec.rb
 - spec/environment_spec.rb
 - spec/examples/models/class_based/forbidden_keyword.rb
 - spec/examples/models/class_based/ignore/ignored.rb
@@ -208,6 +210,7 @@ test_files:
 - spec/command/run_command_spec.rb
 - spec/command/which_spec.rb
 - spec/core_ext/hash/options_spec.rb
+- spec/core_ext/shellwords/clean_spec.rb
 - spec/environment_spec.rb
 - spec/examples/models/class_based/forbidden_keyword.rb
 - spec/examples/models/class_based/ignore/ignored.rb