shelr 0.11.9 → 0.12.0

data/.gitignore

@@ -5,3 +5,5 @@ pkg/*
 doc
 vendor/bundle
 TAGS
+tags
+

data/Gemfile

@@ -1,14 +1,15 @@
 source "http://rubygems.org"
 
-gem 'json'
-
-group :development, :test do
-  gem "pry"
-  gem "pry-nav"
-  gem "rspec"
-  gem "rspec"
-  gem "aruba", :git => 'git://github.com/cucumber/aruba.git'
-  gem "bundler"
-  gem "jeweler"
-  gem "simplecov"
-end
+gem 'rake'
+
+gem "pry"
+gem "pry-nav"
+
+gem "rspec"
+gem "aruba", :git => 'git://github.com/cucumber/aruba.git'
+gem "simplecov"
+
+gem "guard"
+gem 'guard-rspec'
+gem 'guard-bundler'
+gem 'guard-ctags-bundler', git: 'git://github.com/antono/guard-ctags-bundler.git'

data/Gemfile.lock

@@ -1,3 +1,10 @@
+GIT
+  remote: git://github.com/antono/guard-ctags-bundler.git
+  revision: 819284437cd2b98b219675bedf42f9aa36838096
+  specs:
+    guard-ctags-bundler (0.0.5)
+      guard (>= 0.4.0)
+
 GIT
   remote: git://github.com/cucumber/aruba.git
   revision: fabc92edc45bf42b5747a0937dd31511d4ab774a
@@ -25,12 +32,14 @@ GEM
     ffi (1.0.11)
     gherkin (2.9.0)
       json (>= 1.4.6)
-    git (1.2.5)
-    jeweler (1.8.3)
-      bundler (~> 1.0)
-      git (>= 1.2.5)
-      rake
-      rdoc
+    guard (1.0.1)
+      ffi (>= 0.5.0)
+      thor (~> 0.14.6)
+    guard-bundler (0.1.3)
+      bundler (>= 1.0.0)
+      guard (>= 0.2.2)
+    guard-rspec (0.7.0)
+      guard (>= 0.10.0)
     json (1.6.5)
     method_source (0.7.1)
     multi_json (1.1.0)
@@ -41,8 +50,6 @@ GEM
     pry-nav (0.1.0)
       pry (~> 0.9.8.1)
     rake (0.9.2.2)
-    rdoc (3.12)
-      json (~> 1.4)
     rspec (2.8.0)
       rspec-core (~> 2.8.0)
       rspec-expectations (~> 2.8.0)
@@ -57,16 +64,19 @@ GEM
     simplecov-html (0.5.3)
     slop (2.4.4)
     term-ansicolor (1.0.7)
+    thor (0.14.6)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   aruba!
-  bundler
-  jeweler
-  json
+  guard
+  guard-bundler
+  guard-ctags-bundler!
+  guard-rspec
   pry
   pry-nav
+  rake
   rspec
   simplecov

data/Guardfile

@@ -0,0 +1,24 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+guard 'bundler' do
+  watch('Gemfile')
+  # Uncomment next line if Gemfile contain `gemspec' command
+  # watch(/^.+\.gemspec/)
+end
+
+guard 'ctags-bundler' do
+  watch(%r{^(app|lib|spec/support)/.*\.rb$})  { ["app", "lib", "spec/support"] }
+  watch('Gemfile.lock')
+end
+
+guard 'rspec', :version => 2 do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+
+  # Rails example
+  watch(%r{^lib/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
+  watch(%r{^lib/(.*)(\.erb|\.haml)$})                 { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
+  watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
+end

data/lib/shelr/publisher.rb

@@ -18,7 +18,7 @@ module Shelr
         File.open(dump_filename, 'w+') do |f|
           f.puts(prepare(id))
         end
-        puts "=> record dumped to #{dump_filename}"
+        STDOUT.puts "=> record dumped to #{dump_filename}"
       end
     end
 
@@ -27,18 +27,18 @@ module Shelr
     def with_exception_handler(&block)
       yield
     rescue => e
-      puts "=> Something went wrong..."
-      puts e.message
-      puts e.backtrace.join("\n")
+      STDOUT.puts "=> Something went wrong..."
+      STDOUT.puts e.message
+      STDOUT.puts e.backtrace.join("\n")
     end
 
     def handle_response(res)
       res = JSON.parse(res.body)
       if res['ok']
-        puts res['message']
-        puts Shelr::API_URL + '/records/' + res['id']
+        STDOUT.puts res['message']
+        STDOUT.puts Shelr::API_URL + '/records/' + res['id']
       else
-        puts res['message']
+        STDOUT.puts res['message']
       end
     end
 
@@ -48,7 +48,7 @@ module Shelr
 
     def api_key
       unless Shelr.api_key
-        print 'Paste your API KEY [or Enter to publish as Anonymous]: '
+        STDOUT.print 'Paste your API KEY [or Enter to publish as Anonymous]: '
         key = STDIN.gets.strip
         Shelr.api_key = key unless key.empty?
       end
@@ -56,11 +56,11 @@ module Shelr
     end
 
     def prepare(id)
-      puts
-      puts 'Your record will be published under terms of'
-      puts 'Creative Commons Attribution-ShareAlike 3.0 Unported'
-      puts 'See http://creativecommons.org/licenses/by-sa/3.0/ for details.'
-      puts
+      STDOUT.puts
+      STDOUT.puts 'Your record will be published under terms of'
+      STDOUT.puts 'Creative Commons Attribution-ShareAlike 3.0 Unported'
+      STDOUT.puts 'See http://creativecommons.org/licenses/by-sa/3.0/ for details.'
+      STDOUT.puts
 
       out = {}
       ['meta', 'timing', 'typescript'].each do |file|
@@ -69,9 +69,9 @@ module Shelr
 
       meta = JSON.parse(out.delete('meta'))
       meta.each { |k,v| out[k] = v }
-      print 'Description: '
+      STDOUT.print 'Description: '
       out['description'] = STDIN.gets.strip
-      print 'Tags (ex: howto, linux): '
+      STDOUT.print 'Tags (ex: howto, linux): '
       out['tags'] = STDIN.gets.strip
       return out.to_json
     end

data/lib/shelr/recorder.rb

@@ -2,23 +2,7 @@
 module Shelr
   class Recorder
 
-    HEADER = <<-EOH
- ____                        _ _
-|  _ \ ___  ___ ___  _ __ __| (_)_ __   __ _
-| |_) / _ \/ __/ _ \| '__/ _` | | '_ \ / _` |
-|  _ <  __/ (_| (_) | | | (_| | | | | | (_| |
-|_| \_\___|\___\___/|_|  \__,_|_|_| |_|\__, |
-                                       |___/
-    EOH
-
-    FOOTER = <<-EOF
- _____ _       _     _              _
-|  ___(_)_ __ (_)___| |__   ___  __| |
-| |_  | | '_ \| / __| '_ \ / _ \/ _` |
-|  _| | | | | | \__ \ | | |  __/ (_| |
-|_|   |_|_| |_|_|___/_| |_|\___|\__,_|
-
-    EOF
+    attr_accessor :meta, :user_rows, :user_columns
 
     def self.record!
       new.record!
@@ -30,27 +14,28 @@ module Shelr
 
     def record!
       check_record_dir
+      init_terminal
       request_metadata
-      puts HEADER
-      puts "Your session started"
-      puts "Press Ctrl+D or 'exit' to finish recording"
+      STDOUT.puts "-=" * (Shelr.terminal.size[:width] / 2)
+      STDOUT.puts "=> Your session started"
+      STDOUT.puts "=> Please, do not resize your terminal while recording"
+      STDOUT.puts "=> Press Ctrl+D or 'exit' to finish recording"
       system(recorder_cmd)
-      restore_terminal
       save_as_typescript if Shelr.backend == 'ttyrec'
-      puts FOOTER
-      puts
-      puts "Replay  : #{Shelr::APP_NAME} play last"
-      puts "Publish : #{Shelr::APP_NAME} push last"
+      STDOUT.puts "-=" * (Shelr.terminal.size[:width] / 2)
+      STDOUT.puts "=> Session finished"
+      STDOUT.puts
+      STDOUT.puts "Replay  : #{Shelr::APP_NAME} play last"
+      STDOUT.puts "Publish : #{Shelr::APP_NAME} push last"
     end
 
     def request_metadata
-      init_terminal
-      print "Provide HUMAN NAME for Your record: "
+      STDOUT.print "Provide HUMAN NAME for Your record: "
       @meta["title"] = STDIN.gets.strip
       @meta["created_at"] = record_id
       @meta["columns"] = @user_columns
       @meta["rows"] = @user_rows
-      puts record_file('meta')
+      STDOUT.puts record_file('meta')
       File.open(record_file('meta'), 'w+') do |meta|
         meta.puts @meta.to_json
       end
@@ -77,11 +62,8 @@ module Shelr
     end
 
     def init_terminal
-      @user_rows, @user_columns = `stty size`.split(' ')
-    end
-
-    def restore_terminal
-      # system("stty columns #{@user_columns} rows #{@user_rows}")
+      @user_rows, @user_columns =
+        Shelr.terminal.size[:height], Shelr.terminal.size[:width]
     end
 
     def record_dir

data/lib/shelr/terminal.rb

@@ -0,0 +1,9 @@
+# encoding: utf-8
+module Shelr
+  class Terminal
+    def size
+      height, width = `stty size`.split(' ')
+      { :height => height.to_i, :width => width.to_i }
+    end
+  end
+end

data/lib/shelr/version.rb

@@ -1,3 +1,3 @@
 module Shelr
-  VERSION = '0.11.9'
+  VERSION = '0.12.0'
 end

data/lib/shelr.rb

@@ -16,6 +16,7 @@ module Shelr
   autoload :Player,    'shelr/player.rb'
   autoload :Publisher, 'shelr/publisher.rb'
   autoload :TTYRec,    'shelr/ttyrec.rb'
+  autoload :Terminal,  'shelr/terminal.rb'
   autoload :VERSION,   'shelr/version.rb'
 
   class << self
@@ -51,6 +52,10 @@ module Shelr
       File.basename(Dir[File.join(DATA_DIR, '*')].sort.last)
     end
 
+    def terminal
+      @terminal ||= Shelr::Terminal.new
+    end
+
     private
 
     def ensure_config_dir_exist

data/spec/shelr/publisher_spec.rb

@@ -1,16 +1,18 @@
 require 'spec_helper'
 
 describe Shelr::Publisher do
-  before :each do
+  before do
+    STDOUT.stub(:puts)
+    STDOUT.stub(:print)
     File.stub(:open)
     Net::HTTP.stub(:post_form)
   end
 
   describe "#publish(id)" do
-    it "should prepare record as json" do
+    it "prepares record as json" do
       STDIN.stub(:gets).and_return('something')
       subject.stub(:handle_response)
-      subject.stub(:prepare).and_return(fixture('record1.json'))
+      subject.stub(:prepare).and_return(Fixture::load('record1.json'))
       subject.should_receive(:prepare).with('hello')
 
       subject.publish('hello')
@@ -18,18 +20,18 @@ describe Shelr::Publisher do
   end
 
   describe "#dump_filename" do
-    it "should return `pwd` + /shelr-record.json" do
+    it "returns `pwd` + /shelr-record.json" do
       subject.send(:dump_filename).should == File.join(Dir.getwd, 'shelr-record.json')
     end
   end
 
   describe "#dump(id)" do
-    before :each do
+    before do
       @file = mock('dump file')
       File.stub(:open).and_yield @file
     end
 
-    it "should save prepared dump to #dump_filename" do
+    it "saves prepared dump to #dump_filename" do
       File.should_receive(:open).with(subject.send(:dump_filename), 'w+')
       subject.should_receive(:prepare).with('hello').and_return('dump')
       @file.should_receive(:puts).with('dump')

data/spec/shelr/recorder_spec.rb

@@ -2,19 +2,58 @@ require 'spec_helper'
 
 describe Shelr::Recorder do
 
-  before(:each) do
+  before do
     STDIN.stub(:gets).and_return('my shellcast')
     Shelr.backend = 'script'
+    STDOUT.stub(:puts)
+    STDOUT.stub(:print)
   end
 
   describe "#record!" do
-    before(:each) do
+    before do
       subject.stub(:system).with(anything).and_return(true)
     end
 
-    it "should start script session" do
-      subject.should_receive("system").with(Regexp.compile("script"))
+    it "starts script session" do
+      subject.should_receive(:system).with(/script/)
       subject.record!
     end
   end
+
+  describe "#request_metadata" do
+    before do
+      STDIN.stub(:gets => 'Hello')
+      subject.stub(:record_id => "1")
+      File.stub(:open => true)
+    end
+
+    it "adds columns and rows to @meta" do
+      subject.user_rows = 10
+      subject.user_columns = 20
+      subject.request_metadata
+      subject.meta["rows"].should == 10
+      subject.meta["columns"].should == 20
+    end
+
+    it "adds record_id to @meta as created_at" do
+      subject.stub(:record_id => 'ololo')
+      subject.request_metadata
+      subject.meta["created_at"].should == 'ololo'
+    end
+
+    it "reads title from stdin" do
+      STDIN.stub(:gets => 'C00l title')
+      subject.request_metadata
+      subject.meta["title"].should == 'C00l title'
+    end
+  end
+
+  describe "#init_terminal" do
+    it "gets user_columns and user_rows from system" do
+      Shelr.stub(:terminal).and_return(mock(:size => { :width => 10, :height => 20 }))
+      subject.send :init_terminal
+      subject.user_rows.should == 20
+      subject.user_columns.should == 10
+    end
+  end
 end

data/spec/shelr/terminal_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe Shelr::Terminal do
+
+  describe "#size" do
+    it "returns :width and :height as integers" do
+      subject.size[:width].should be_a(Integer)
+      subject.size[:height].should be_a(Integer)
+    end
+  end
+end

data/spec/shelr_spec.rb

@@ -1,15 +1,19 @@
 require 'spec_helper'
 
 describe Shelr do
-  it "should have ::APP_NAME defined" do
+  it "has ::APP_NAME defined" do
     Shelr::APP_NAME.should_not be_nil
   end
 
-  it "should provide XDG and APP_NAME based ::DATA_DIR" do
+  it "provides XDG and APP_NAME based ::DATA_DIR" do
     Shelr::DATA_DIR.should == File.join(ENV['XDG_DATA_HOME'], Shelr::APP_NAME)
   end
 
-  it "should provide XDG config path" do
+  it "provides XDG config path" do
     Shelr::CONFIG_DIR.should == File.join(ENV['XDG_CONFIG_HOME'], Shelr::APP_NAME)
   end
+
+  it "provides terminal info" do
+    Shelr.terminal.should be_a(Shelr::Terminal)
+  end
 end

data/spec/spec_helper.rb

@@ -26,13 +26,10 @@ require "bundler/setup"
 require 'pry'
 require 'pry-nav'
 
+RSpec.configure do |config|
+  config.mock_with :rspec
+end
+
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
-
-def fixture(name)
-  file = File.join(File.expand_path("../fixtures/#{name}", __FILE__))
-  require 'pp'
-  pp file
-  JSON.parse(File.read(file))
-end

data/spec/support/fixture.rb

@@ -0,0 +1,6 @@
+module Fixture
+  def self.load(name)
+    file = File.join(File.expand_path("../../fixtures/#{name}", __FILE__))
+    JSON.parse(File.read(file))
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shelr
 version: !ruby/object:Gem::Version
-  version: 0.11.9
+  version: 0.12.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-25 00:00:00.000000000 Z
+date: 2012-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &16036960 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,7 +23,12 @@ dependencies:
         version: 1.6.5
   type: :runtime
   prerelease: false
-  version_requirements: *16036960
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.5
 description: Screencast utility for unix shell junkies
 email: self@antono.info
 executables:
@@ -37,6 +42,7 @@ files:
 - .rvmrc
 - Gemfile
 - Gemfile.lock
+- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -49,6 +55,7 @@ files:
 - lib/shelr/player.rb
 - lib/shelr/publisher.rb
 - lib/shelr/recorder.rb
+- lib/shelr/terminal.rb
 - lib/shelr/ttyrec.rb
 - lib/shelr/version.rb
 - shelr.1
@@ -58,8 +65,10 @@ files:
 - spec/shelr/player_spec.rb
 - spec/shelr/publisher_spec.rb
 - spec/shelr/recorder_spec.rb
+- spec/shelr/terminal_spec.rb
 - spec/shelr_spec.rb
 - spec/spec_helper.rb
+- spec/support/fixture.rb
 homepage: http://shelr.tv/
 licenses:
 - GPLv3
@@ -81,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Screencasts for Shell Ninjas