briefcase 0.4.1 → 0.4.2

data/README.md

@@ -11,6 +11,10 @@ installation and usage documentation.
 
 ## Changelog
 
+* 0.4.2 Git command argument are properly escaped (Sebastian Spieszko)
+
+        Changed the instruction delimiter when redacting files to '!!'.
+
 * 0.4.1 Git command now properly passes options through to git, and also allows
         git output to display in color.
 

data/briefcase.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
   s.test_files = Dir['spec/*.rb']
 
   s.add_runtime_dependency('commander')
+  s.add_runtime_dependency('escape')
   s.add_development_dependency('minitest')
   s.add_development_dependency('open4')
   s.add_development_dependency('rake', '0.9.2.2')

data/lib/briefcase/commands/git.rb

@@ -1,3 +1,5 @@
+require 'escape'
+
 module Briefcase
   module Commands
 
@@ -20,7 +22,7 @@ module Briefcase
       # create an empty git repository.
       def execute
         verify_dotfiles_directory_exists
-        command = @args.join(' ')
+        command = Escape.shell_command(@args)
         intro("Running git %s in %s", command, dotfiles_path)
         run_git_command(command)
       end

data/lib/briefcase/commands/redact.rb

@@ -8,15 +8,15 @@ module Briefcase
     class Redact < Import
 
       EDITING_HELP_TEXT = <<-TEXT
-# Edit the file below, replacing and sensitive information to turn this:
-#
-#   password: superSecretPassword
-#
-# Into:
-#
-#   password: # briefcase(password)
-#
-########################################################################
+!! Edit the file below, replacing any sensitive information to turn this:
+!!
+!!   password: superSecretPassword
+!!
+!! Into:
+!!
+!!   password: # briefcase(password)
+!!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 TEXT
 
       private
@@ -37,14 +37,12 @@ TEXT
         redacted_path = destination + ".#{REDACTED_EXTENSION}"
         info "Creating redacted version at #{redacted_path}"
 
-        content_to_edit = original_content = File.read(destination)
+        original_content = File.read(destination)
 
-        unless Briefcase.testing?
-          content_to_edit = EDITING_HELP_TEXT + content_to_edit
-        end
+        content_to_edit = EDITING_HELP_TEXT + original_content
 
         write_file(redacted_path, content_to_edit)
-        edited_content = edit_file_with_editor(redacted_path).gsub!(EDITING_HELP_TEXT, '')
+        edited_content = edit_file_with_editor(redacted_path).gsub(/^!!.*\r?\n/, '')
         write_file(redacted_path, edited_content)
 
         edited_content.lines.each_with_index do |line, line_index|

data/lib/briefcase/version.rb

@@ -1,3 +1,3 @@
 module Briefcase
-  VERSION = '0.4.1'
+  VERSION = '0.4.2'
 end

data/spec/import_spec.rb

@@ -67,22 +67,22 @@ describe Briefcase::Commands::Import do
       symlink_must_exist(@original_path, @destination_path)
     end
 
-    it "imports a redacted dotfile" do
+    it "imports a redacted dotfile xxx" do
       redacted_path = File.join(dotfiles_path, 'test.redacted')
       create_file @original_path, <<-TEXT
 setting: ABCDEFG
 TEXT
 
       stub_editor_response redacted_path, <<-TEXT
-# Edit the file below, replacing and sensitive information to turn this:
-#
-#   password: superSecretPassword
-#
-# Into:
-#
-#   password: # briefcase(password)
-#
-########################################################################
+!! Edit the file below, replacing and sensitive information to turn this:
+!!
+!!   password: superSecretPassword
+!!
+!! Into:
+!!
+!!   password: # briefcase(password)
+!!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 setting: # briefcase(token)
 TEXT
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: briefcase
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 4
-  - 1
-  version: 0.4.1
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - Jim Benton
@@ -32,7 +32,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: minitest
+  name: escape
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -43,10 +43,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: open4
+  name: minitest
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -60,9 +60,23 @@ dependencies:
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: open4
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -75,11 +89,11 @@ dependencies:
         - 2
         version: 0.9.2.2
   type: :development
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: turn
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -89,7 +103,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id005
+  version_requirements: *id006
 description: Command line program to migrate dotfiles to a git repo at ~/.dotfiles and generate static dotfiles with secret values.
 email: jim@autonomousmachine.com
 executables: