tryrb 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5938ffd17f0b2e187e365bf48e959c3113189c82
-  data.tar.gz: a00e195b696b75dc49183127cea6a3c4f534dbe4
+  metadata.gz: 7433c7c65a665d4cd86719f2867b18ff718a7679
+  data.tar.gz: 1e173c59ac6d9b45697d81da0899fc8a38200144
 SHA512:
-  metadata.gz: 0fd3a62db0ff9417e7241d7ce645300f7bb7e13698ca49a10095c93268d8a627d850e70bc2038f6a1094ea4738cc3206b0aacba690fa55d24c02720e55e1d4c0
-  data.tar.gz: 88a942b594d4a84202d5b8e47ad6e48075874024c73656e3403b58a19929e4da41bc04faa1e521e07a13ac06c2e8ca675971eaaf6cb7a7672ef7eba73fc15d78
+  metadata.gz: f91459a4b90f0dbb5564531ac0aa99363c685798ea49dbadeddbd1149cec9757f56d6e2dd42e9646542b92275769194c983c2dac38bd98ba9c1a048f1c13d688
+  data.tar.gz: 8873c2cedaf63641f6cc5f45b6df2d026891777e49f66d6664ce8248116dc5b48b2112456faa2ee475e5aab6a0ed270c97511745f1487450b703c8307fedcdc4

data/Rakefile

@@ -1,11 +1,8 @@
 require "bundler/gem_tasks"
-require 'rake/testtask'
 
-Rake::TestTask.new do |t|
-  t.libs << "spec"
-  t.test_files = FileList['spec/*_spec.rb']
-  t.verbose = true
+task :console do
+  require 'pry'
+  require 'tryrb'
+  ARGV.clear
+  Pry.start
 end
-
-desc "Run tests"
-task :default => :test

data/lib/tryrb/cli.rb

@@ -5,43 +5,66 @@ require 'tryrb/config'
 module TryRb
   class CLI < Thor
     def initialize(*)
-      @config = TryRb::Config.instance
       super
     end
 
+    no_commands do
+      def conf
+        TryRb::Config.instance
+      end
+    end
+
     desc "create [FILENAME]", 'create a file to edit (short-cut alias: "c")'
     def create(key_name="")
       @key_name = key_name
-      system([@config.editor, fullpath] * ' ')
+      system([conf.editor, fullpath] * ' ')
     end
-
     map 'c' => :create
 
-    option :last, aliases: "-l", banner: 'N', desc: 'open the last N file in the files you specify via filename, default is the 1', type: :numeric, lazy_default: 1
-    desc "exec [FILENAME]", 'open a file to edit, default is last one of all files (short-cut alias: "e")'
+    option :last, :aliases => "-l", :banner => 'N', :desc => 'execute the last N file in the files you specify via filename, default is the 1', :type => :numeric, :lazy_default => 1
+    desc "exec [FILENAME]", 'execute a ruby script, default is last one of all files (short-cut alias: "e")'
     def exec(filename=nil)
-      file_path = find_file(filename: filename, last_n: options[:last])
+      file_path = find_file(:filename => filename, :last_n => options[:last])
       abort "Can't find the file you want" unless file_path
       system(['ruby', file_path] * ' ')
     end
-
     map 'e' => :exec
 
+    desc 'config', "Config your editor and tmp_dir via command"
+    def config
+      default_tmp_path = "~/tmp/tryrb"
+      tmp_dir = ask("Please specify your dir of the tmp files(default: #{default_tmp_path}):")
+      tmp_dir = default_tmp_path if tmp_dir.empty?
+
+      default_editor = "vim"
+      editor = ask("Please specify your favorite editor(default: #{default_editor}):")
+      editor = default_editor if editor.empty?
+
+      config = {'tmp_dir' => tmp_dir, 'editor' => editor}
+
+      rc_path = conf.expanded_rc_path
+      File.open(rc_path, 'w') do |f|
+        f.write(config.to_yaml)
+      end
+
+      say("The config have been writen to ~/.tryrbrc", :green)
+    end
+
     private
 
       def find_file(options={})
         filename = options[:filename]
         last_n   = options[:last_n] || 1
-        names = Dir[File.join(@config.expanded_tmp_dir, '*.rb')]
+        names = Dir[File.join(conf.expanded_tmp_dir, '*.rb')]
         names = names.select { |n| n =~ /#{filename}\.rb$/ } if filename
         names[-last_n]
       end
 
       def fullpath
         filename = get_filename
-        expanded_path = @config.expanded_tmp_dir
+        expanded_path = conf.expanded_tmp_dir
         FileUtils.mkdir_p expanded_path unless Dir.exists?(expanded_path)
-        File.join @config.tmp_dir, filename
+        File.join conf.tmp_dir, filename
       rescue Errno::EEXIST => e
         abort "File #{e.message.split[-1]} exists. The tmp directory can't be created! Please delete the file first."
       end

data/lib/tryrb/config.rb

@@ -3,42 +3,32 @@ require 'singleton'
 module TryRb
   class Config
     include Singleton
-    attr_reader :path
-    FILE_NAME = '.tryrbrc'
 
     %w[tmp_dir editor].each do |key|
       define_method key.to_sym do
-        @data[key]
+        data[key]
       end
     end
 
-    def initialize
-      @path = File.join(File.expand_path('~'), FILE_NAME)
-      @data = load_file
-    end
-
-    def path=(path)
-      @path = path
-      @data = load_file
-      @path
+    def data
+      @data ||= load_file
     end
 
     def load_file
       require 'yaml'
-      YAML.load_file(@path)
+      YAML.load_file(expanded_rc_path)
     rescue Errno::ENOENT
-      default_config
+      TryRb::CLI::Shell::Color.new.say("Please run `tryrb config` to configure.", :red)
+      abort
+    end
+
+    def expanded_rc_path
+      File.expand_path('~/.tryrbrc')
     end
 
     def expanded_tmp_dir
       File.expand_path(tmp_dir)
     end
 
-    private
-
-      def default_config
-        {'tmp_dir' => "~/tmp/tryrb",
-         'editor'  => 'mvim'}
-      end
   end
 end

data/lib/tryrb/version.rb

@@ -2,7 +2,7 @@ module TryRb
   class Version
     MAJOR = 1
     MINOR = 1
-    PATCH = 0
+    PATCH = 1
     PRE = nil
 
     class << self

data/spec/cli_spec.rb

@@ -3,12 +3,12 @@ require 'helper'
 describe TryRb::CLI do
   before :each do
     Time.stub(:now) { Date.parse('2014-1-1').to_time }
-    TryRb::Config.instance.path = fixture_file_path('tryrbrc')
+    TryRb::Config.instance.stub(:expanded_rc_path) { fixture_file_path('tryrbrc') }
     @cli = TryRb::CLI.new
   end
 
   describe '#create' do
-    it 'create a file 201401010000.rb' do
+    it 'create a file 20140101000000.rb' do
       expect(@cli).to receive(:system).with('emacs ~/tmp/foo/tryrb/20140101000000.rb')
       @cli.create
     end
@@ -16,42 +16,78 @@ describe TryRb::CLI do
       expect(@cli).to receive(:system).with('emacs ~/tmp/foo/tryrb/20140101000000_foo.rb')
       @cli.create 'foo'
     end
+    it 'abort caused by existing file' do
+      FakeFS.activate!
+      FileUtils.mkdir_p '/tmp'
+      FileUtils.touch '/tmp/foo'
+      @cli.stub(:system)
+      expect(TryRb::Config.instance).to receive(:expanded_tmp_dir).and_return('/tmp/foo/tryrb')
+      expect(@cli).to receive(:abort).with("File foo exists. The tmp directory can't be created! Please delete the file first.")
+      @cli.create
+      FileUtils.rm_rf '/tmp/foo'
+      FakeFS.deactivate!
+    end
   end
 
   describe '#exec' do
     before :each do
-      FileUtils.mkdir_p 'tmp/foo/tryrb'
-      FileUtils.touch 'tmp/foo/tryrb/20140101000000_foo.rb'
-      FileUtils.touch 'tmp/foo/tryrb/20140102000000_foo.rb'
-      FileUtils.touch 'tmp/foo/tryrb/20140103000000_bar.rb'
-      expect(TryRb::Config.instance).to receive(:expanded_tmp_dir).and_return('tmp/foo/tryrb')
+      FakeFS.activate!
+      FileUtils.mkdir_p '/tmp/foo/tryrb'
+      FileUtils.touch '/tmp/foo/tryrb/20140101000000_foo.rb'
+      FileUtils.touch '/tmp/foo/tryrb/20140102000000_foo.rb'
+      FileUtils.touch '/tmp/foo/tryrb/20140103000000_bar.rb'
+      expect(TryRb::Config.instance).to receive(:expanded_tmp_dir).and_return('/tmp/foo/tryrb')
     end
     after :each do
-      FileUtils.rm_rf 'tmp/foo'
+      FileUtils.rm_rf '/tmp/foo'
+      FakeFS.deactivate!
     end
     it 'exec last file' do
-      expect(@cli).to receive(:system).with('ruby tmp/foo/tryrb/20140103000000_bar.rb')
+      expect(@cli).to receive(:system).with('ruby /tmp/foo/tryrb/20140103000000_bar.rb')
       @cli.exec
     end
     it 'exec last file with filename' do
-      expect(@cli).to receive(:system).with('ruby tmp/foo/tryrb/20140102000000_foo.rb')
+      expect(@cli).to receive(:system).with('ruby /tmp/foo/tryrb/20140102000000_foo.rb')
       @cli.exec 'foo'
     end
     it 'exec last second file' do
-      expect(@cli).to receive(:options).and_return({last: 2})
-      expect(@cli).to receive(:system).with('ruby tmp/foo/tryrb/20140102000000_foo.rb')
+      expect(@cli).to receive(:options).and_return({:last => 2})
+      expect(@cli).to receive(:system).with('ruby /tmp/foo/tryrb/20140102000000_foo.rb')
       @cli.exec
     end
     it 'exec last second file with filename' do
-      expect(@cli).to receive(:options).and_return({last: 2})
-      expect(@cli).to receive(:system).with('ruby tmp/foo/tryrb/20140101000000_foo.rb')
+      expect(@cli).to receive(:options).and_return({:last => 2})
+      expect(@cli).to receive(:system).with('ruby /tmp/foo/tryrb/20140101000000_foo.rb')
       @cli.exec 'foo'
     end
     it 'abort because there is no file' do
       @cli.stub(:system)
-      expect(@cli).to receive(:options).and_return({last: 4})
+      expect(@cli).to receive(:options).and_return({:last => 4})
       expect(@cli).to receive(:abort).with("Can't find the file you want")
       @cli.exec
     end
   end
+
+  describe '#config' do
+    before :each do
+      @shell = TryRb::CLI::Shell::Basic.new
+      FakeFS.activate!
+    end
+    after :each do
+      FileUtils.rm '/tmp/.tryrbrc'
+      FakeFS.deactivate!
+    end
+    it "save config data in tryrbrc" do
+      cli = TryRb::CLI.new
+      expect(TryRb::Config.instance).to receive(:expanded_rc_path).and_return('/tmp/.tryrbrc')
+      expect(cli).to receive(:ask).with("Please specify your dir of the tmp files(default: ~/tmp/tryrb):").and_return('~/foo/tryrb')
+      expect(cli).to receive(:ask).with("Please specify your favorite editor(default: vim):").and_return('emacs')
+      cli.config
+      if RUBY_VERSION < '2.1.0'
+        expect(File.open('/tmp/.tryrbrc').read).to eq("---\ntmp_dir: ~/foo/tryrb\neditor: emacs\n")
+      else
+        expect(File.open('/tmp/.tryrbrc').read).to eq("---\ntmp_dir: \"~/foo/tryrb\"\neditor: emacs\n")
+      end
+    end
+  end
 end

data/spec/config_spec.rb

@@ -15,7 +15,7 @@ describe TryRb::Config do
   describe '#tmp_dir' do
     it "returns tmp dir" do
       config = TryRb::Config.instance
-      config.path = fixture_file_path('tryrbrc')
+      config.stub(:expanded_rc_path) { fixture_file_path('tryrbrc') }
       expect(config.tmp_dir).to eq '~/tmp/foo/tryrb'
     end
   end
@@ -23,37 +23,26 @@ describe TryRb::Config do
   describe '#editor' do
     it "returns editor" do
       config = TryRb::Config.instance
-      config.path = fixture_file_path('tryrbrc')
+      config.stub(:expanded_rc_path) { fixture_file_path('tryrbrc') }
       expect(config.editor).to eq 'emacs'
     end
   end
 
-  describe '#path=' do
-    it 'overrides path' do
-      config = TryRb::Config.instance
-      config.path = fixture_file_path('foorc')
-      expect(config.path).to eq fixture_file_path('foorc')
-    end
-    it 'reloads data' do
-      config = TryRb::Config.instance
-      config.path = fixture_file_path('tryrbrc')
-      expect(config.load_file.keys).to eq %w[tmp_dir editor]
-    end
-  end
-
   describe 'load_file' do
     context 'when file exists at path' do
       it 'loads data from the file' do
         config = TryRb::Config.instance
-        config.path = fixture_file_path('tryrbrc')
+        config.stub(:expanded_rc_path) { fixture_file_path('tryrbrc') }
         expect(config.tmp_dir).to eq '~/tmp/foo/tryrb'
       end
     end
     context 'when file does not exist' do
       it 'loads default data' do
         config = TryRb::Config.instance
-        config.path = fixture_file_path('foorc')
-        expect(config.tmp_dir).to eq '~/tmp/tryrb'
+        config.stub(:expanded_rc_path) { fixture_file_path('foorc') }
+        expect(config).to receive(:abort)
+        TryRb::CLI::Shell::Color.any_instance.stub(:say)
+        config.load_file
       end
     end
   end

data/spec/helper.rb

@@ -1,5 +1,19 @@
+require 'simplecov'
+require 'coveralls'
+
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+  SimpleCov::Formatter::HTMLFormatter,
+  Coveralls::SimpleCov::Formatter
+]
+
+SimpleCov.start do
+  add_filter '/spec/'
+  minimum_coverage(99)
+end
+
 require 'tryrb'
 require 'rspec'
+require 'fakefs/spec_helpers'
 
 RSpec.configure do |config|
   config.expect_with :rspec do |c|

data/tryrb.gemspec

@@ -16,5 +16,7 @@ Gem::Specification.new do |s|
   s.executables << 'tryrb'
   s.require_paths = ["lib"]
   s.homepage    = 'https://github.com/tony612/tryrb'
-  s.add_dependency 'thor'
+  s.add_dependency 'thor', '~> 0.18.1'
+  s.add_development_dependency 'bundler', '~> 1.0'
+  s.post_install_message = "Please use `tryrb config` to configure."
 end

metadata

@@ -1,29 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: tryrb
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Tony Han
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-07 00:00:00.000000000 Z
+date: 2014-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.18.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.18.1
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: Try ruby code in a temporary file created.
 email: h.bing612@gmail.com
 executables:
@@ -47,7 +61,7 @@ homepage: https://github.com/tony612/tryrb
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message: Please use `tryrb config` to configure.
 rdoc_options: []
 require_paths:
 - lib