deployml 0.5.2 → 0.5.4

data/.gitignore

@@ -0,0 +1,9 @@
+doc
+pkg
+tmp/*
+.DS_Store
+.yardoc
+*.db
+*.log
+*.swp
+*~

data/ChangeLog.md

@@ -1,3 +1,13 @@
+### 0.5.4 / 2012-05-28
+
+* Fixed a typo in the gemspec, which incorrectly set
+  `required_rubygems_version` to the same value as `required_ruby_version`.
+
+### 0.5.3 / 2012-05-27
+
+* Require addressable ~> 2.2.
+* Require thor ~> 0.14.
+
 ### 0.5.2 / 2011-06-21
 
 * Added {DeploYML::Shell#ruby}.

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2011 Hal Brodigan
+Copyright (c) 2010-2012 Hal Brodigan
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,7 +1,7 @@
 # DeploYML
 
-* [Source](http://github.com/postmodern/deployml)
-* [Issues](http://github.com/postmodern/deployml/issues)
+* [Source](https://github.com/postmodern/deployml)
+* [Issues](https://github.com/postmodern/deployml/issues)
 * [Documentation](http://rubydoc.info/gems/deployml/frames)
 * [Email](mailto:postmodern.mod3 at gmail.com)
 
@@ -137,9 +137,9 @@ List available tasks:
 ## Requirements
 
 * [ruby](http://www.ruby-lang.org/) >= 1.8.6
-* [addressable](http://addressable.rubyforge.org/) ~> 2.2.0
-* [rprogram](http://github.com/postmodern/rprogram) ~> 0.2
-* [thor](http://github.com/wycats/thor) ~> 0.14.3
+* [addressable](http://addressable.rubyforge.org/) ~> 2.2
+* [rprogram](https://github.com/postmodern/rprogram) ~> 0.2
+* [thor](https://github.com/wycats/thor) ~> 0.14
 
 ## Install
 
@@ -147,6 +147,6 @@ List available tasks:
 
 ## Copyright
 
-Copyright (c) 2010-2011 Hal Brodigan
+Copyright (c) 2010-2012 Hal Brodigan
 
 See {file:LICENSE.txt} for license information.

data/Rakefile

@@ -2,13 +2,13 @@ require 'rubygems'
 require 'rake'
 
 begin
-  gem 'ore-tasks', '~> 0.4'
-  require 'ore/tasks'
+  gem 'rubygems-tasks', '~> 0.1'
+  require 'rubygems/tasks'
 
-  Ore::Tasks.new
+  Gem::Tasks.new
 rescue LoadError => e
-  STDERR.puts e.message
-  STDERR.puts "Run `gem install ore-tasks` to install 'ore/tasks'."
+  warn e.message
+  warn "Run `gem install rubygems-tasks` to install 'rubygems/tasks'."
 end
 
 begin
@@ -25,7 +25,7 @@ task :test => :spec
 task :default => :spec
 
 begin
-  gem 'yard', '~> 0.7.0'
+  gem 'yard', '~> 0.7'
   require 'yard'
 
   YARD::Rake::YardocTask.new  

data/deployml.gemspec

@@ -2,126 +2,59 @@
 
 require 'yaml'
 
-Gem::Specification.new do |gemspec|
-  files = if File.directory?('.git')
-            `git ls-files`.split($/)
-          elsif File.directory?('.hg')
-            `hg manifest`.split($/)
-          elsif File.directory?('.svn')
-            `svn ls -R`.split($/).select { |path| File.file?(path) }
-          else
-            Dir['{**/}{.*,*}'].select { |path| File.file?(path) }
-          end
+Gem::Specification.new do |gem|
+  gemspec = YAML.load_file('gemspec.yml')
 
-  filter_files = lambda { |paths|
-    case paths
-    when Array
-      (files & paths)
-    when String
-      (files & Dir[paths])
-    end
-  }
-
-  version = {
-    :file => 'lib/deployml/version.rb',
-    :constant => 'DeploYML::VERSION'
-  }
-
-  defaults = {
-    'name' => File.basename(File.dirname(__FILE__)),
-    'files' => files,
-    'executables' => filter_files['bin/*'].map { |path| File.basename(path) },
-    'test_files' => filter_files['{test/{**/}*_test.rb,spec/{**/}*_spec.rb}'],
-    'extra_doc_files' => filter_files['*.{txt,rdoc,md,markdown,tt,textile}'],
-  }
-
-  metadata = defaults.merge(YAML.load_file('gemspec.yml'))
-
-  gemspec.name = metadata.fetch('name',defaults[:name])
-  gemspec.version = if metadata['version']
-                      metadata['version']
-                    elsif File.file?(version[:file])
-                      require File.join('.',version[:file])
-                      eval(version[:constant])
-                    end
-
-  gemspec.summary = metadata.fetch('summary',metadata['description'])
-  gemspec.description = metadata.fetch('description',metadata['summary'])
-
-  case metadata['license']
-  when Array
-    gemspec.licenses = metadata['license']
-  when String
-    gemspec.license = metadata['license']
-  end
-
-  case metadata['authors']
-  when Array
-    gemspec.authors = metadata['authors']
-  when String
-    gemspec.author = metadata['authors']
-  end
+  gem.name    = gemspec.fetch('name')
+  gem.version = gemspec.fetch('version') do
+                  lib_dir = File.join(File.dirname(__FILE__),'lib')
+                  $LOAD_PATH << lib_dir unless $LOAD_PATH.include?(lib_dir)
 
-  gemspec.email = metadata['email']
-  gemspec.homepage = metadata['homepage']
+                  require 'deployml/version'
+                  DeploYML::VERSION
+                end
 
-  case metadata['require_paths']
-  when Array
-    gemspec.require_paths = metadata['require_paths']
-  when String
-    gemspec.require_path = metadata['require_paths']
-  end
+  gem.summary     = gemspec['summary']
+  gem.description = gemspec['description']
+  gem.licenses    = Array(gemspec['license'])
+  gem.authors     = Array(gemspec['authors'])
+  gem.email       = gemspec['email']
+  gem.homepage    = gemspec['homepage']
 
-  gemspec.files = filter_files[metadata['files']]
+  glob = lambda { |patterns| gem.files & Dir[*patterns] }
 
-  gemspec.executables = metadata['executables']
-  gemspec.extensions = metadata['extensions']
+  gem.files = `git ls-files`.split($/)
+  gem.files = glob[gemspec['files']] if gemspec['files']
 
-  if Gem::VERSION < '1.7.'
-    gemspec.default_executable = gemspec.executables.first
+  gem.executables = gemspec.fetch('executables') do
+    glob['bin/*'].map { |path| File.basename(path) }
   end
+  gem.default_executable = gem.executables.first if Gem::VERSION < '1.7.'
 
-  gemspec.test_files = filter_files[metadata['test_files']]
-
-  unless gemspec.files.include?('.document')
-    gemspec.extra_rdoc_files = metadata['extra_doc_files']
-  end
-
-  gemspec.post_install_message = metadata['post_install_message']
-  gemspec.requirements = metadata['requirements']
-
-  if gemspec.respond_to?(:required_ruby_version=)
-    gemspec.required_ruby_version = metadata['required_ruby_version']
-  end
+  gem.extensions       = glob[gemspec['extensions'] || 'ext/**/extconf.rb']
+  gem.test_files       = glob[gemspec['test_files'] || '{test/{**/}*_test.rb']
+  gem.extra_rdoc_files = glob[gemspec['extra_doc_files'] || '*.{txt,md}']
 
-  if gemspec.respond_to?(:required_rubygems_version=)
-    gemspec.required_rubygems_version = metadata['required_ruby_version']
-  end
+  gem.require_paths = Array(gemspec.fetch('require_paths') {
+    %w[ext lib].select { |dir| File.directory?(dir) }
+  })
 
-  parse_versions = lambda { |versions|
-    case versions
-    when Array
-      versions.map { |v| v.to_s }
-    when String
-      versions.split(/,\s*/)
-    end
-  }
+  gem.requirements              = gemspec['requirements']
+  gem.required_ruby_version     = gemspec['required_ruby_version']
+  gem.required_rubygems_version = gemspec['required_rubygems_version']
+  gem.post_install_message      = gemspec['post_install_message']
 
-  if metadata['dependencies']
-    metadata['dependencies'].each do |name,versions|
-      gemspec.add_dependency(name,parse_versions[versions])  
-    end
-  end
+  split = lambda { |string| string.split(/,\s*/) }
 
-  if metadata['runtime_dependencies']
-    metadata['runtime_dependencies'].each do |name,versions|
-      gemspec.add_runtime_dependency(name,parse_versions[versions])  
+  if gemspec['dependencies']
+    gemspec['dependencies'].each do |name,versions|
+      gem.add_dependency(name,split[versions])
     end
   end
 
-  if metadata['development_dependencies']
-    metadata['development_dependencies'].each do |name,versions|
-      gemspec.add_development_dependency(name,parse_versions[versions])  
+  if gemspec['development_dependencies']
+    gemspec['development_dependencies'].each do |name,versions|
+      gem.add_development_dependency(name,split[versions])
     end
   end
 end

data/gemspec.yml

@@ -7,17 +7,17 @@ description:
 license: MIT
 authors: Postmodern
 email: postmodern.mod3@gmail.com
-homepage: http://github.com/postmodern/deployml
+homepage: https://github.com/postmodern/deployml#readme
 has_yard: true
 
 required_ruby_version: ">= 1.8.6"
 
 dependencies:
-  addressable: ~> 2.2.0
+  addressable: ~> 2.2
   rprogram: ~> 0.2
-  thor: ~> 0.14.3
+  thor: ~> 0.14
 
 development_dependencies:
-  ore-tasks: ~> 0.4
+  rubygems-tasks: ~> 0.1
   rspec: ~> 2.4
-  yard: ~> 0.7.0
+  yard: ~> 0.7

data/lib/deployml/shell.rb

@@ -83,6 +83,7 @@ module DeploYML
       # assume that `.rb` scripts do not have a `#!/usr/bin/env ruby`
       command.unshift('ruby') if program[-3,3] == '.rb'
 
+      # if the environment uses bundler, run all ruby commands via `bundle exec`
       if (@environment && @environment.bundler)
         command.unshift('bundle','exec')
       end
@@ -163,7 +164,7 @@ module DeploYML
     # @param [Array] arguments
     #   Additional arguments to pass to the `rake` task.
     #
-    # @param [String]
+    # @return [String]
     #   The `rake` task name to be called.
     #
     def rake_task(name,*arguments)

data/lib/deployml/version.rb

@@ -1,4 +1,4 @@
 module DeploYML
   # deploYML version
-  VERSION = '0.5.2'
+  VERSION = '0.5.4'
 end

metadata

@@ -1,97 +1,126 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: deployml
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.5.4
   prerelease: 
-  version: 0.5.2
 platform: ruby
-authors: 
+authors:
 - Postmodern
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-21 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-05-28 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: addressable
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 2.2.0
+      - !ruby/object:Gem::Version
+        version: '2.2'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rprogram
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.2'
+- !ruby/object:Gem::Dependency
+  name: rprogram
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "0.2"
+      - !ruby/object:Gem::Version
+        version: '0.2'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: thor
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.14.3
+      - !ruby/object:Gem::Version
+        version: '0.14'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: ore-tasks
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.14'
+- !ruby/object:Gem::Dependency
+  name: rubygems-tasks
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "0.4"
+      - !ruby/object:Gem::Version
+        version: '0.1'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "2.4"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.4'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: yard
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.7.0
+      - !ruby/object:Gem::Version
+        version: '2.4'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.7'
   type: :development
-  version_requirements: *id006
-description: DeploYML is a simple deployment solution that uses a single YAML file, Git and SSH.
-email: 
-- postmodern.mod3@gmail.com
-executables: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.7'
+description: DeploYML is a simple deployment solution that uses a single YAML file,
+  Git and SSH.
+email: postmodern.mod3@gmail.com
+executables:
 - deployml
 extensions: []
-
-extra_rdoc_files: 
-- README.md
-- LICENSE.txt
+extra_rdoc_files:
 - ChangeLog.md
-files: 
+- LICENSE.txt
+- README.md
+files:
 - .document
 - .gemtest
+- .gitignore
 - .rspec
 - .yardopts
 - ChangeLog.md
@@ -141,36 +170,29 @@ files:
 - spec/project_spec.rb
 - spec/remote_shell_spec.rb
 - spec/spec_helper.rb
-homepage: http://github.com/postmodern/deployml
-licenses: 
+homepage: https://github.com/postmodern/deployml#readme
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.6
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: deployml
-rubygems_version: 1.8.5
+rubyforge_project: 
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A simple deployment solution that works.
-test_files: 
-- spec/remote_shell_spec.rb
-- spec/project_spec.rb
-- spec/environment_spec.rb
-- spec/configuration_spec.rb
-- spec/deployml_spec.rb
+test_files: []