duct 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f20e93081ed84a57df274ce99797d4aba409c43e
-  data.tar.gz: f075c2159472292ee1cb0f6cae1927b06cb2a8a8
+  metadata.gz: f8a8c002275b3c0420bf6a8100926ca2c3f040e5
+  data.tar.gz: 152e605c97313504941167cbfe8e4885263bc707
 SHA512:
-  metadata.gz: 0b8619568bf00163da213ee8bd4ea5480d582101b9dcc7916fb9a4cca4032126682f27488b23694f2897d274b8dd8a0710adea06ee9ae4c7616ec0c8740c4fc8
-  data.tar.gz: 76cde8fe434e75b2101bf13d92cc3a96d095141aeb08a6cd78017c6f09d56d5f7c6627660ef8f8810638a62df88d8f5d079f79c6b6c3f198e1ca80a8130aaa67
+  metadata.gz: 66e18fc1a6c2cb94f2e20555b115fc50019e9779c1f0ef5d04e22125917010ac510fc605f6dd3d1d2d3ec080dbf73aad28a30a53a9f672583dd07b838c6ad3dd
+  data.tar.gz: 1654140af0a517d8e8de470f2f1df31b02db1806a06189e9b914abb6f39c7338a2c62f681e15c47bc31d09491dfec6f485384d54316c6cb809a97b122d5f33df

data/.gitignore

@@ -3,7 +3,6 @@
 .bundle
 .config
 .yardoc
-Gemfile.lock
 InstalledFiles
 _yardoc
 coverage

data/.travis.yml

@@ -0,0 +1,8 @@
+language: ruby
+rvm:
+  - 2.1.0
+  - 2.0.0
+  - 1.9.3
+  - jruby-19mode
+  - rbx
+cache: bundler

data/CHANGELOG.md

@@ -0,0 +1,17 @@
+# Change Log
+
+All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). Based on the format proposed by [Keep a Changelog](http://keepachangelog.com/).
+
+## [0.1.1] [2015-10-04]
+
+### Added
+
+* This change log :)
+
+### Fixed
+
+* Fixed bug that didn't allow scripts with a space in the filename (thanks @ZimbiX)
+
+## [0.1.0] [2014-01-13]
+
+Initial release

data/Gemfile

@@ -1,4 +1,5 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in duct.gemspec
 gemspec
+
+gem 'rubysl-singleton', platform: 'rbx'

data/Gemfile.lock

@@ -0,0 +1,32 @@
+PATH
+  remote: .
+  specs:
+    duct (0.1.1)
+      bundler
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    diff-lcs (1.2.5)
+    rake (10.1.1)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.7)
+    rspec-expectations (2.14.4)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.4)
+    rubysl-singleton (2.0.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  duct!
+  rake
+  rspec
+  rubysl-singleton
+
+BUNDLED WITH
+   1.10.6

data/README.md

@@ -1,4 +1,4 @@
-# Duct
+# Duct [![Build Status](https://travis-ci.org/porras/duct.png?branch=master)](https://travis-ci.org/porras/duct)
 
 ![Duct Tape, By Evan-Amos, via Wikimedia Commons](http://upload.wikimedia.org/wikipedia/commons/thumb/8/89/Duct-tape.jpg/256px-Duct-tape.jpg)
 
@@ -70,8 +70,23 @@ filename:
 $ duct update sinatra my_script.rb
 ```
 
-Remember that updating the bundle will update the `Gemfile.lock` section in your script, so remember to save those
-changes.
+Remember that updating the bundle will update the `Gemfile.lock` section in your script, so remember to save those changes.
+
+### Using Duct in shebangs
+
+Under Unix-like operating systems, you can instruct the program loader to use Duct to run your script. Just put the following [shebang](http://en.wikipedia.org/wiki/Shebang_(Unix)) in the first line of your script (the `# ruby` comment is needed because of something explained [here](http://devoh.com/blog/2012/11/local-environment-variables)):
+
+```ruby
+#!/usr/bin/env duct # ruby
+```
+and add execute permissions to your script:
+
+```zsh
+chmod +x my_script
+```
+
+This gives you the ability to treat your script as an executable that, once in your $PATH, to execute it directly.
+
 
 ### Using the script data
 

data/duct.gemspec

@@ -20,7 +20,6 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "bundler"
 
-  spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
 end

data/lib/duct/runner.rb

@@ -1,19 +1,40 @@
 require 'tmpdir'
 require 'stringio'
+require 'shellwords'
 
 module Duct
   class Runner
     def initialize(config)
       @config = config
-      @script, @data = File.read(@config.filename).split(/^__END__$/, 2)
-      @preamble = @data.split(/^@@\s*(.*\S)\s*$/, 2).first
+    end
+
+    def file_content
+      @file_content ||= File.read(@config.filename).split(/^__END__$/, 2)
+    end
+
+    def script
+      @script ||= file_content.first
+    end
+
+    def data
+      @data ||= file_content.last
+    end
+
+    def preamble
+      @preamble ||= data.split(/^@@\s*(.*\S)\s*$/, 2).first
     end
 
     def run
       copy_embedded_files
       system "BUNDLE_GEMFILE=#{tempdir}/Gemfile bundle #{@config.command}"
       update_embedded_files
-      exec "BUNDLE_GEMFILE=#{tempdir}/Gemfile bundle exec ruby #{@config.filename} #{@config.params.join(' ')}; rm -rf #{tempdir}" unless @config.command
+      exec script_command unless @config.command
+    end
+
+    def script_command
+      filename = @config.filename.shellescape
+      params = @config.params.join(' ')
+      "BUNDLE_GEMFILE=#{tempdir}/Gemfile bundle exec ruby #{filename} #{params}; rm -rf #{tempdir}"
     end
 
     private
@@ -25,10 +46,10 @@ module Duct
     end
 
     def update_embedded_files
-      contents = @script.dup
+      contents = script.dup
 
       contents << "__END__"
-      contents << @preamble
+      contents << preamble
 
       Dir.glob("#{tempdir}/*") do |filename|
         contents << "@@ #{File.basename(filename)}\n"
@@ -41,7 +62,7 @@ module Duct
     def embedded_files
       @embedded_files ||= {}.tap do |files|
         file = nil
-        @data.each_line do |line|
+        data.each_line do |line|
           if line =~ /^@@\s*(.*\S)\s*$/
             file = ''
             files[$1.to_sym] = file

data/lib/duct/version.rb

@@ -1,3 +1,3 @@
 module Duct
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/unit/cli_spec.rb

@@ -13,6 +13,15 @@ describe Duct::Cli do
     its(:error?)   { should be_false }
   end
 
+  context 'filename with space' do
+    let(:argv) { ['myscript space.rb'] }
+
+    its(:filename) { should == 'myscript space.rb' }
+    its(:command)  { should be_nil }
+    its(:params)   { should be_empty }
+    its(:error?)   { should be_false }
+  end
+
   context 'filename and params' do
     let(:argv) { ['myscript.rb', 'param1', 'param2'] }
 
@@ -20,6 +29,17 @@ describe Duct::Cli do
     its(:command)  { should be_nil }
     its(:params)   { should == ['param1', 'param2'] }
     its(:error?)   { should be_false }
+    its('runner.script_command') { should match(%r{.+ruby myscript.rb param1 param2.+}) }
+  end
+
+  context 'filename with space and params' do
+    let(:argv) { ['myscript space.rb', 'param1', 'param2'] }
+
+    its(:filename) { should == 'myscript space.rb' }
+    its(:command)  { should be_nil }
+    its(:params)   { should == ['param1', 'param2'] }
+    its(:error?)   { should be_false }
+    its('runner.script_command') { should match(%r{.+ruby myscript\\ space.rb param1 param2.+}) }
   end
 
   context 'command and filename' do

metadata

@@ -1,69 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: duct
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Sergio Gil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-13 00:00:00.000000000 Z
+date: 2015-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Embeds a Gemfile in a script
@@ -74,8 +60,11 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
+- ".travis.yml"
+- CHANGELOG.md
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -98,17 +87,17 @@ 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.0.3
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Embeds a Gemfile in a script