shellplay 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e02d4dbe489e3e9de59a3a09253b8e39a594a36b
-  data.tar.gz: c23c4d33901443037398e9282b9c9b9b88d466af
+  metadata.gz: 188691449457664d2cd0d87dd5dfac9ea87ba211
+  data.tar.gz: bfb44ea0af4cee6b0c03f2157a00e64a4a4a2b84
 SHA512:
-  metadata.gz: 314022691921f9f2d835cd2f06c75d255319d71812d3c9db875cd80978c79397507daee0df8c2bd0313f85a210d4c14460a5f5a49e9f942d792a745562d8bd69
-  data.tar.gz: 5810ed0efd1511414facbbd44ed7a435c9fd6aacbae4866cd08a972b89d5e2bdab06a2f9d3da0dfe1df50ccff2624e5beae4ccda769f05045f287d287129a11b
+  metadata.gz: ee3d60f66dc90cbbb3b92261f51d33e5cae7fc78b44d418eecba5d81c20b65783eeafe4ce7f9f5a914b1d001821ae318168daab44770c5e9ba5122a495b32c57
+  data.tar.gz: 378068c3c353337bb1b6f533b39849b969df862de90bc9693901370a8feecbaa28474d7548d525ffe359e546bce79a11c320f41bcbfec5b7dc3b3ce8d8b0e96c

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 Shellplay Changelog
 =========================
 
+v0.1.1 - 2014-08-17
+--------------------
+- remove the need for input of prompt and timeformat if they are included in the session
+
 v0.1.0 - 2014-08-17
 ----------------------
 - first version seems ok, it's running and has been used on the field

data/bin/shellplay

@@ -42,7 +42,7 @@ def display(screen)
     if screen.customprompt
       print screen.customprompt
     else
-      print @session.prompt || @session.config.prompt
+      print @session.config.prompt
     end
     sleep @sleeptime
     print screen.stdin
@@ -127,6 +127,6 @@ while continue do
   end
   if @playprompt
     print "\n\e[33m>\e[0m "
-    printf("\e[33melapsed: \e[0m\e[1;93m#{@session.timeformat || @session.config.timeformat}s\e[0m ", @lastelapsed) unless @lastelapsed == 0
+    printf("\e[33melapsed: \e[0m\e[1;93m#{@session.config.timeformat}s\e[0m ", @lastelapsed) unless @lastelapsed == 0
   end
 end

data/lib/shellplay/config.rb

@@ -8,21 +8,24 @@ module Shellplay
     include Cliprompt
 
     def initialize(options = nil, input = STDIN, output = STDOUT)
-      super(options = nil, input = STDIN, output = STDOUT)
+      super(options, input = STDIN, output = STDOUT)
     end
 
     def set_defaults
       default :basedir, File.join(ENV['HOME'], '.shellplay')
+      default :basefile, File.join(self.basedir, 'config.yml')
       super
     end
 
     def setup
-      values = {}
-      output.puts Paint['Create a new shellplay configuration:', :blue]
-      values['editor'] = guess 'EDITOR', 'What is the path to launch your text editor?', 'vim'
-      values['prompt'] = ask 'What is the default prompt you want to use?', "\e[36m #{ENV['USER']} > \e[0m"
-      values['timeformat'] = ask 'What is the time format you want to display?', '%.1f'
-      write values
+      unless self.prompt && self.timeformat
+        values = {}
+        output.puts Paint['Create a new shellplay configuration:', :blue]
+        #values['editor'] = guess 'EDITOR', 'What is the path to launch your text editor?', 'vim'
+        values['prompt'] = ask 'What is the default prompt you want to use?', "\e[36m #{ENV['USER']} > \e[0m"
+        values['timeformat'] = ask 'What is the time format you want to display?', '%.1f'
+        write values
+      end
     end
 
   end

data/lib/shellplay/session.rb

@@ -12,24 +12,27 @@ module Shellplay
 
     attr_reader :title, :config, :pointer, :sequence, :prompt, :timeformat
 
-    def initialize(input = STDIN, output = STDOUT)
+    def initialize(basedir = nil, basefile = nil, input = STDIN, output = STDOUT)
       @sequence = []
       @title = false
       @prompt = false
       @timeformat = false
-      @config = Shellplay::Config.new(nil, input, output)
       @pointer = 0
+      @basedir = basedir || File.join(ENV['HOME'], '.shellplay')
+      @basefile = basefile || 'config.yml'
+      @input = input
+      @output = output
     end
 
     def import(name)
       unless name
-        sessions = Dir.glob(File.join(@config.basedir, '*.json'))
+        sessions = Dir.glob(File.join(@basedir, '*.json'))
         if sessions.count == 0
-          puts "There is no recorded session locally."
-          puts "Do you want to play a remote recording?"
+          @output.puts "There is no recorded session locally."
+          @output.puts "Do you want to play a remote recording?"
           name = ask "url: "
         else
-          puts "What session do you want to load?"
+          @output.puts "What session do you want to load?"
           name = ask "(input a number or an url if you want to play a remote recording)",
             aslist: true,
             choices: sessions.map { |f| File.basename(f, '.json') }
@@ -38,12 +41,15 @@ module Shellplay
       if /^https?:\/\//.match name
         infile = open(name) { |f| f.read }
       else
-        infile = IO.read(File.join(@config.basedir, "#{name}.json"))
+        infile = IO.read(File.join(@basedir, "#{name}.json"))
       end
       data = JSON.parse(infile)
       @title = data['title']
-      @prompt = data['prompt']
-      @timeformat = data['timeformat']
+      @config = Shellplay::Config.new({
+        basedir: @basedir,
+        basefile: File.join(@basedir, @basefile),
+        prompt: data['prompt'],
+        timeformat: data['timeformat'] }, input, output)
       data['sequence'].each do |screenhash|
         add_screen(screenhash)
       end

data/spec/files/{session.json → config/session.json}

@@ -1,5 +1,7 @@
 {
   "title": "test prez",
+  "prompt": "> ",
+  "timeformat": "%.1f",
   "sequence": [
     {
       "stdin": "ls",

data/spec/lib/shellplay/session_spec.rb

@@ -4,10 +4,11 @@ require "shellplay/session"
 
 describe Shellplay::Session, "A shellplay session" do
 
-  let(:sessionfile) { File.expand_path('../../../files/session.json', __FILE__)}
+  let(:basedir) { File.expand_path('../../../files/config', __FILE__) }
+  let(:basefile) { 'session.json' }
   let(:input) { StringIO.new }
   let(:output) { StringIO.new }
-  subject { Shellplay::Session.new(input, output) }
+  subject { Shellplay::Session.new(basedir, basefile, input, output) }
 
   describe '.new' do
     context 'when there is no prior configuration file, ' do
@@ -17,7 +18,7 @@ describe Shellplay::Session, "A shellplay session" do
   describe ".import" do
 
     context "when we import a valid file, " do
-      before  { subject.import(sessionfile) }
+      before { subject.import('session') }
       it "fills up instance variables from the file" do
         expect(subject.title).to eq "test prez"
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shellplay
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - mose
@@ -136,7 +136,7 @@ files:
 - lib/shellplay/screen.rb
 - lib/shellplay/session.rb
 - shellplay.gemspec
-- spec/files/session.json
+- spec/files/config/session.json
 - spec/lib/shellplay/screen_spec.rb
 - spec/lib/shellplay/session_spec.rb
 - spec/spec_helper.rb
@@ -166,7 +166,7 @@ signing_key:
 specification_version: 4
 summary: CLI tool for shell-based presentations.
 test_files:
-- spec/files/session.json
+- spec/files/config/session.json
 - spec/lib/shellplay/screen_spec.rb
 - spec/lib/shellplay/session_spec.rb
 - spec/spec_helper.rb