[DRE-commits] [ruby-session] 01/10: Imported Upstream version 3.2.0
Caitlin Matos
cm-guest at moszumanska.debian.org
Wed Jul 23 15:32:25 UTC 2014
This is an automated email from the git hooks/post-receive script.
cm-guest pushed a commit to branch master
in repository ruby-session.
commit 768c94c415cb6158306845bc504b7f8f252ba0ff
Author: Caitlin Matos <caitlin.matos at zoho.com>
Date: Wed Jul 23 10:22:42 2014 -0400
Imported Upstream version 3.2.0
---
Rakefile | 235 +++++++++++++++++++++++++++++++++++++++++++++---------
checksums.yaml.gz | Bin 0 -> 426 bytes
lib/session.rb | 9 ++-
metadata.yml | 77 +++++++-----------
session.gemspec | 33 ++++++--
5 files changed, 261 insertions(+), 93 deletions(-)
diff --git a/Rakefile b/Rakefile
index cd11779..5ec3ac3 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,19 +1,69 @@
-
This.rubyforge_project = 'codeforpeople'
This.author = "Ara T. Howard"
This.email = "ara.t.howard at gmail.com"
-This.homepage = "http://github.com/ahoward/#{ This.lib }/tree/master"
+This.homepage = "https://github.com/ahoward/#{ This.lib }"
+task :license do
+ open('LICENSE', 'w'){|fd| fd.puts "same as ruby's"}
+end
task :default do
- puts(Rake::Task.tasks.map{|task| task.name} - ['default'])
+ puts((Rake::Task.tasks.map{|task| task.name.gsub(/::/,':')} - ['default']).sort)
+end
+
+task :test do
+ run_tests!
+end
+
+namespace :test do
+ task(:unit){ run_tests!(:unit) }
+ task(:functional){ run_tests!(:functional) }
+ task(:integration){ run_tests!(:integration) }
+end
+
+def run_tests!(which = nil)
+ which ||= '**'
+ test_dir = File.join(This.dir, "test")
+ test_glob ||= File.join(test_dir, "#{ which }/**_test.rb")
+ test_rbs = Dir.glob(test_glob).sort
+
+ div = ('=' * 119)
+ line = ('-' * 119)
+
+ test_rbs.each_with_index do |test_rb, index|
+ testno = index + 1
+ command = "#{ This.ruby } -w -I ./lib -I ./test/lib #{ test_rb }"
+
+ puts
+ say(div, :color => :cyan, :bold => true)
+ say("@#{ testno } => ", :bold => true, :method => :print)
+ say(command, :color => :cyan, :bold => true)
+ say(line, :color => :cyan, :bold => true)
+
+ system(command)
+
+ say(line, :color => :cyan, :bold => true)
+
+ status = $?.exitstatus
+
+ if status.zero?
+ say("@#{ testno } <= ", :bold => true, :color => :white, :method => :print)
+ say("SUCCESS", :color => :green, :bold => true)
+ else
+ say("@#{ testno } <= ", :bold => true, :color => :white, :method => :print)
+ say("FAILURE", :color => :red, :bold => true)
+ end
+ say(line, :color => :cyan, :bold => true)
+
+ exit(status) unless status.zero?
+ end
end
task :gemspec do
- ignore_extensions = 'git', 'svn', 'tmp', /sw./, 'bak', 'gem'
- ignore_directories = 'pkg'
- ignore_files = 'test/log'
+ ignore_extensions = ['git', 'svn', 'tmp', /sw./, 'bak', 'gem']
+ ignore_directories = ['pkg']
+ ignore_files = ['test/log']
shiteless =
lambda do |list|
@@ -39,69 +89,86 @@ task :gemspec do
version = This.version
files = shiteless[Dir::glob("**/**")]
executables = shiteless[Dir::glob("bin/*")].map{|exe| File.basename(exe)}
- has_rdoc = true #File.exist?('doc')
+ #has_rdoc = true #File.exist?('doc')
test_files = "test/#{ lib }.rb" if File.file?("test/#{ lib }.rb")
summary = object.respond_to?(:summary) ? object.summary : "summary: #{ lib } kicks the ass"
description = object.respond_to?(:description) ? object.description : "description: #{ lib } kicks the ass"
+ license = object.respond_to?(:license) ? object.license : "same as ruby's"
- extensions = This.extensions
- if extensions.nil?
+ if This.extensions.nil?
+ This.extensions = []
+ extensions = This.extensions
%w( Makefile configure extconf.rb ).each do |ext|
extensions << ext if File.exists?(ext)
end
end
extensions = [extensions].flatten.compact
+ if This.dependencies.nil?
+ dependencies = []
+ else
+ case This.dependencies
+ when Hash
+ dependencies = This.dependencies.values
+ when Array
+ dependencies = This.dependencies
+ end
+ end
+
template =
if test(?e, 'gemspec.erb')
Template{ IO.read('gemspec.erb') }
else
Template {
<<-__
- ## #{ lib }.gemspec
+ ## <%= lib %>.gemspec
#
Gem::Specification::new do |spec|
- spec.name = #{ lib.inspect }
- spec.version = #{ version.inspect }
+ spec.name = <%= lib.inspect %>
+ spec.version = <%= version.inspect %>
spec.platform = Gem::Platform::RUBY
- spec.summary = #{ lib.inspect }
- spec.description = #{ description.inspect }
+ spec.summary = <%= lib.inspect %>
+ spec.description = <%= description.inspect %>
+ spec.license = <%= license.inspect %>
- spec.files = #{ files.inspect }
- spec.executables = #{ executables.inspect }
+ spec.files =\n<%= files.sort.pretty_inspect %>
+ spec.executables = <%= executables.inspect %>
spec.require_path = "lib"
- spec.has_rdoc = #{ has_rdoc.inspect }
- spec.test_files = #{ test_files.inspect }
- #spec.add_dependency 'lib', '>= version'
- spec.add_dependency 'fattr'
+ spec.test_files = <%= test_files.inspect %>
+
+ <% dependencies.each do |lib_version| %>
+ spec.add_dependency(*<%= Array(lib_version).flatten.inspect %>)
+ <% end %>
- spec.extensions.push(*#{ extensions.inspect })
+ spec.extensions.push(*<%= extensions.inspect %>)
- spec.rubyforge_project = #{ This.rubyforge_project.inspect }
- spec.author = #{ This.author.inspect }
- spec.email = #{ This.email.inspect }
- spec.homepage = #{ This.homepage.inspect }
+ spec.rubyforge_project = <%= This.rubyforge_project.inspect %>
+ spec.author = <%= This.author.inspect %>
+ spec.email = <%= This.email.inspect %>
+ spec.homepage = <%= This.homepage.inspect %>
end
__
}
end
- open("#{ lib }.gemspec", "w"){|fd| fd.puts template}
- This.gemspec = "#{ lib }.gemspec"
+ Fu.mkdir_p(This.pkgdir)
+ gemspec = "#{ lib }.gemspec"
+ open(gemspec, "w"){|fd| fd.puts(template)}
+ This.gemspec = gemspec
end
task :gem => [:clean, :gemspec] do
- Fu.mkdir_p This.pkgdir
+ Fu.mkdir_p(This.pkgdir)
before = Dir['*.gem']
cmd = "gem build #{ This.gemspec }"
`#{ cmd }`
after = Dir['*.gem']
gem = ((after - before).first || after.first) or abort('no gem!')
- Fu.mv gem, This.pkgdir
- This.gem = File.basename(gem)
+ Fu.mv(gem, This.pkgdir)
+ This.gem = File.join(This.pkgdir, File.basename(gem))
end
task :readme do
@@ -125,8 +192,8 @@ task :readme do
end
template =
- if test(?e, 'readme.erb')
- Template{ IO.read('readme.erb') }
+ if test(?e, 'README.erb')
+ Template{ IO.read('README.erb') }
else
Template {
<<-__
@@ -157,9 +224,18 @@ task :release => [:clean, :gemspec, :gem] do
gems = Dir[File.join(This.pkgdir, '*.gem')].flatten
raise "which one? : #{ gems.inspect }" if gems.size > 1
raise "no gems?" if gems.size < 1
- cmd = "rubyforge login && rubyforge add_release #{ This.rubyforge_project } #{ This.lib } #{ This.version } #{ This.pkgdir }/#{ This.gem }"
+
+ cmd = "gem push #{ This.gem }"
+ puts cmd
+ puts
+ system(cmd)
+ abort("cmd(#{ cmd }) failed with (#{ $?.inspect })") unless $?.exitstatus.zero?
+
+ cmd = "rubyforge login && rubyforge add_release #{ This.rubyforge_project } #{ This.lib } #{ This.version } #{ This.gem }"
puts cmd
- system cmd
+ puts
+ system(cmd)
+ abort("cmd(#{ cmd }) failed with (#{ $?.inspect })") unless $?.exitstatus.zero?
end
@@ -167,26 +243,38 @@ end
BEGIN {
+# support for this rakefile
+#
$VERBOSE = nil
require 'ostruct'
require 'erb'
require 'fileutils'
+ require 'rbconfig'
+ require 'pp'
+# fu shortcut
+#
Fu = FileUtils
+# cache a bunch of stuff about this rakefile/environment
+#
This = OpenStruct.new
This.file = File.expand_path(__FILE__)
This.dir = File.dirname(This.file)
This.pkgdir = File.join(This.dir, 'pkg')
+# grok lib
+#
lib = ENV['LIB']
unless lib
- lib = File.basename(Dir.pwd)
+ lib = File.basename(Dir.pwd).sub(/[-].*$/, '')
end
This.lib = lib
+# grok version
+#
version = ENV['VERSION']
unless version
require "./lib/#{ This.lib }"
@@ -196,9 +284,28 @@ BEGIN {
end
This.version = version
+# see if dependencies are export by the module
+#
+ if This.object.respond_to?(:dependencies)
+ This.dependencies = This.object.dependencies
+ end
+
+# we need to know the name of the lib an it's version
+#
abort('no lib') unless This.lib
abort('no version') unless This.version
+# discover full path to this ruby executable
+#
+ c = Config::CONFIG
+ bindir = c["bindir"] || c['BINDIR']
+ ruby_install_name = c['ruby_install_name'] || c['RUBY_INSTALL_NAME'] || 'ruby'
+ ruby_ext = c['EXEEXT'] || ''
+ ruby = File.join(bindir, (ruby_install_name + ruby_ext))
+ This.ruby = ruby
+
+# some utils
+#
module Util
def indent(s, n = 2)
s = unindent(s)
@@ -208,7 +315,7 @@ BEGIN {
def unindent(s)
indent = nil
- s.each do |line|
+ s.each_line do |line|
next if line =~ %r/^\s*$/
indent = line[%r/^\s*/] and break
end
@@ -217,17 +324,71 @@ BEGIN {
extend self
end
+# template support
+#
class Template
def initialize(&block)
@block = block
@template = block.call.to_s
end
def expand(b=nil)
- ERB.new(Util.unindent(@template)).result(b||@block)
+ ERB.new(Util.unindent(@template)).result((b||@block).binding)
end
alias_method 'to_s', 'expand'
end
def Template(*args, &block) Template.new(*args, &block) end
+# colored console output support
+#
+ This.ansi = {
+ :clear => "\e[0m",
+ :reset => "\e[0m",
+ :erase_line => "\e[K",
+ :erase_char => "\e[P",
+ :bold => "\e[1m",
+ :dark => "\e[2m",
+ :underline => "\e[4m",
+ :underscore => "\e[4m",
+ :blink => "\e[5m",
+ :reverse => "\e[7m",
+ :concealed => "\e[8m",
+ :black => "\e[30m",
+ :red => "\e[31m",
+ :green => "\e[32m",
+ :yellow => "\e[33m",
+ :blue => "\e[34m",
+ :magenta => "\e[35m",
+ :cyan => "\e[36m",
+ :white => "\e[37m",
+ :on_black => "\e[40m",
+ :on_red => "\e[41m",
+ :on_green => "\e[42m",
+ :on_yellow => "\e[43m",
+ :on_blue => "\e[44m",
+ :on_magenta => "\e[45m",
+ :on_cyan => "\e[46m",
+ :on_white => "\e[47m"
+ }
+ def say(phrase, *args)
+ options = args.last.is_a?(Hash) ? args.pop : {}
+ options[:color] = args.shift.to_s.to_sym unless args.empty?
+ keys = options.keys
+ keys.each{|key| options[key.to_s.to_sym] = options.delete(key)}
+
+ color = options[:color]
+ bold = options.has_key?(:bold)
+
+ parts = [phrase]
+ parts.unshift(This.ansi[color]) if color
+ parts.unshift(This.ansi[:bold]) if bold
+ parts.push(This.ansi[:clear]) if parts.size > 1
+
+ method = options[:method] || :puts
+
+ Kernel.send(method, parts.join)
+ end
+
+# always run out of the project dir
+#
Dir.chdir(This.dir)
}
diff --git a/checksums.yaml.gz b/checksums.yaml.gz
new file mode 100644
index 0000000..6402b7e
Binary files /dev/null and b/checksums.yaml.gz differ
diff --git a/lib/session.rb b/lib/session.rb
index 12162e2..e8b808f 100755
--- a/lib/session.rb
+++ b/lib/session.rb
@@ -5,9 +5,13 @@ require 'yaml'
require 'tempfile'
module Session
- VERSION = '3.1.0'
+ VERSION = '3.2.0'
def self.version() VERSION end
+ def Session.description
+ 'persistent connections with external programs like bash'
+ end
+
@track_history = ENV['SESSION_HISTORY'] || ENV['SESSION_TRACK_HISTORY']
@use_spawn = ENV['SESSION_USE_SPAWN']
@use_open3 = ENV['SESSION_USE_OPEN3']
@@ -373,6 +377,9 @@ module Session
line = iodat[:io].gets
+ # In case their are weird chars, this will avoid a "invalid byte sequence in US-ASCII" error
+ line.force_encoding("binary") if line.respond_to? :force_encoding
+
buf = nil
case line
diff --git a/metadata.yml b/metadata.yml
index 15b16ca..c9d7ae0 100644
--- a/metadata.yml
+++ b/metadata.yml
@@ -1,41 +1,26 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification
name: session
-version: !ruby/object:Gem::Version
- version: 3.1.0
+version: !ruby/object:Gem::Version
+ version: 3.2.0
platform: ruby
-authors:
+authors:
- Ara T. Howard
autorequire:
bindir: bin
cert_chain: []
-
-date: 2010-05-20 00:00:00 -06:00
-default_executable:
-dependencies:
-- !ruby/object:Gem::Dependency
- name: fattr
- type: :runtime
- version_requirement:
- version_requirements: !ruby/object:Gem::Requirement
- requirements:
- - - ">="
- - !ruby/object:Gem::Version
- version: "0"
- version:
-description: "description: session kicks the ass"
+date: 2014-04-07 00:00:00.000000000 Z
+dependencies: []
+description: persistent connections with external programs like bash
email: ara.t.howard at gmail.com
executables: []
-
extensions: []
-
extra_rdoc_files: []
-
-files:
-- gemspec.rb
-- lib/session.rb
+files:
- LICENSE
-- Rakefile
- README
+- Rakefile
+- gemspec.rb
+- lib/session.rb
- sample/bash.rb
- sample/bash.rb.out
- sample/driver.rb
@@ -46,33 +31,29 @@ files:
- sample/threadtest.rb
- session.gemspec
- test/session.rb
-has_rdoc: true
-homepage: http://github.com/ahoward/session/tree/master
-licenses: []
-
+homepage: https://github.com/ahoward/session
+licenses:
+- same as ruby's
+metadata: {}
post_install_message:
rdoc_options: []
-
-require_paths:
+require_paths:
- lib
-required_ruby_version: !ruby/object:Gem::Requirement
- requirements:
- - - ">="
- - !ruby/object:Gem::Version
- version: "0"
- version:
-required_rubygems_version: !ruby/object:Gem::Requirement
- requirements:
- - - ">="
- - !ruby/object:Gem::Version
- version: "0"
- version:
+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: codeforpeople
-rubygems_version: 1.3.5
+rubygems_version: 2.0.3
signing_key:
-specification_version: 3
+specification_version: 4
summary: session
-test_files:
+test_files:
- test/session.rb
diff --git a/session.gemspec b/session.gemspec
index aee4e53..d3af0e2 100644
--- a/session.gemspec
+++ b/session.gemspec
@@ -3,25 +3,44 @@
Gem::Specification::new do |spec|
spec.name = "session"
- spec.version = "3.1.0"
+ spec.version = "3.2.0"
spec.platform = Gem::Platform::RUBY
spec.summary = "session"
- spec.description = "description: session kicks the ass"
+ spec.description = "persistent connections with external programs like bash"
+ spec.license = "same as ruby's"
+
+ spec.files =
+["LICENSE",
+ "README",
+ "Rakefile",
+ "gemspec.rb",
+ "lib",
+ "lib/session.rb",
+ "sample",
+ "sample/bash.rb",
+ "sample/bash.rb.out",
+ "sample/driver.rb",
+ "sample/session_idl.rb",
+ "sample/session_sh.rb",
+ "sample/sh0.rb",
+ "sample/stdin.rb",
+ "sample/threadtest.rb",
+ "session.gemspec",
+ "test",
+ "test/session.rb"]
- spec.files = ["gemspec.rb", "lib", "lib/session.rb", "LICENSE", "Rakefile", "README", "sample", "sample/bash.rb", "sample/bash.rb.out", "sample/driver.rb", "sample/session_idl.rb", "sample/session_sh.rb", "sample/sh0.rb", "sample/stdin.rb", "sample/threadtest.rb", "session.gemspec", "test", "test/session.rb"]
spec.executables = []
spec.require_path = "lib"
- spec.has_rdoc = true
spec.test_files = "test/session.rb"
- #spec.add_dependency 'lib', '>= version'
- spec.add_dependency 'fattr'
+
+
spec.extensions.push(*[])
spec.rubyforge_project = "codeforpeople"
spec.author = "Ara T. Howard"
spec.email = "ara.t.howard at gmail.com"
- spec.homepage = "http://github.com/ahoward/session/tree/master"
+ spec.homepage = "https://github.com/ahoward/session"
end
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-session.git
More information about the Pkg-ruby-extras-commits
mailing list