tryrb 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7252d4539cd37e1802b97cef43868e1c2c4ec3d
-  data.tar.gz: 86c19f2d675deb2b3b29f0edcaf5815a143286ec
+  metadata.gz: 5938ffd17f0b2e187e365bf48e959c3113189c82
+  data.tar.gz: a00e195b696b75dc49183127cea6a3c4f534dbe4
 SHA512:
-  metadata.gz: b19eb84f36fd761916f048f60e75a3a5e6e971475db75b17919226e5a63e54b36e795f3615d6420ef77a4a4d16df76c2292c3042399dbd123540b7da0a5cba16
-  data.tar.gz: 3f7dcfd287acd5b637498b0a97b488588dbe1e5768852d404ff8c61ef303e7112d997378bbcde8837651226bb5a88988531610bc17abe2ee50a052353a2a1dce
+  metadata.gz: 0fd3a62db0ff9417e7241d7ce645300f7bb7e13698ca49a10095c93268d8a627d850e70bc2038f6a1094ea4738cc3206b0aacba690fa55d24c02720e55e1d4c0
+  data.tar.gz: 88a942b594d4a84202d5b8e47ad6e48075874024c73656e3403b58a19929e4da41bc04faa1e521e07a13ac06c2e8ca675971eaaf6cb7a7672ef7eba73fc15d78

data/lib/tryrb/cli.rb

@@ -1,18 +1,45 @@
-require 'tryrb/config'
 require 'fileutils'
+require 'thor'
+require 'tryrb/config'
 
 module TryRb
-  class CLI
-    @config = TryRb::Config.instance
-    class << self
-      attr_writer :config
-      def start(args)
-        system([@config.editor, fullpath(args[0])] * ' ')
+  class CLI < Thor
+    def initialize(*)
+      @config = TryRb::Config.instance
+      super
+    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] * ' ')
+    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")'
+    def exec(filename=nil)
+      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
+
+    private
+
+      def find_file(options={})
+        filename = options[:filename]
+        last_n   = options[:last_n] || 1
+        names = Dir[File.join(@config.expanded_tmp_dir, '*.rb')]
+        names = names.select { |n| n =~ /#{filename}\.rb$/ } if filename
+        names[-last_n]
       end
 
-      def fullpath(filename)
-        filename = get_filename(filename)
-        expanded_path = File.expand_path(@config.tmp_dir)
+      def fullpath
+        filename = get_filename
+        expanded_path = @config.expanded_tmp_dir
         FileUtils.mkdir_p expanded_path unless Dir.exists?(expanded_path)
         File.join @config.tmp_dir, filename
       rescue Errno::EEXIST => e
@@ -27,11 +54,10 @@ module TryRb
         '.rb'
       end
 
-      def get_filename(name)
+      def get_filename
         parts = [filename_prefix]
-        parts << name.gsub(/\.rb$/, '') if name
+        parts << @key_name.gsub(/\.rb$/, '') unless @key_name.empty?
         parts * '_' + filename_extname
       end
-    end
   end
 end

data/lib/tryrb/config.rb

@@ -30,6 +30,10 @@ module TryRb
       default_config
     end
 
+    def expanded_tmp_dir
+      File.expand_path(tmp_dir)
+    end
+
     private
 
       def default_config

data/lib/tryrb/version.rb

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

data/spec/cli_spec.rb

@@ -3,80 +3,55 @@ 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')
+    @cli = TryRb::CLI.new
   end
-  describe '::start' do
-    it "should call system method with an editor" do
-      TryRb::Config.instance.path = fixture_file_path('tryrbrc')
-      expect(TryRb::CLI).to receive(:system).with('emacs ~/tmp/foo/tryrb/20140101000000_filename.rb')
-      TryRb::CLI.start(["filename"])
-    end
 
-    it "should call system method with right filepath and default editor" do
-      TryRb::Config.instance.path = fixture_file_path('foorc')
-      expect(TryRb::CLI).to receive(:system).with('mvim ~/tmp/tryrb/20140101000000_filename.rb')
-      TryRb::CLI.start(["filename"])
+  describe '#create' do
+    it 'create a file 201401010000.rb' do
+      expect(@cli).to receive(:system).with('emacs ~/tmp/foo/tryrb/20140101000000.rb')
+      @cli.create
+    end
+    it 'create a file 20140101000000_foo.rb' do
+      expect(@cli).to receive(:system).with('emacs ~/tmp/foo/tryrb/20140101000000_foo.rb')
+      @cli.create 'foo'
     end
   end
 
-  describe '::fullpath' do
+  describe '#exec' do
     before :each do
-      TryRb::Config.instance.path = fixture_file_path('tryrbrc')
-      FileUtils.mkdir project_path + '/tmp' unless Dir.exists?(project_path + '/tmp')
+      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.rmdir project_path + '/tmp'
-    end
-    it 'return fullpath of the file' do
-      expect(TryRb::CLI.fullpath('bar')).to eq('~/tmp/foo/tryrb/20140101000000_bar.rb')
-    end
-    it 'return right filename with a file *.rb' do
-      expect(TryRb::CLI.fullpath('bar.rb')).to eq('~/tmp/foo/tryrb/20140101000000_bar.rb')
-    end
-
-    context 'when the Dir does not exists' do
-      it 'create a dir' do
-        Dir.stub(:exists?) { false }
-        TryRb::Config.instance.stub(:tmp_dir) { project_path + '/tmp/tryrb' }
-        expect(FileUtils).to receive(:mkdir_p).with(project_path + '/tmp/tryrb')
-        TryRb::CLI.fullpath('bar')
-      end
-    end
-
-    context 'when the Dir exists' do
-      it 'does not create a dir' do
-        Dir.stub(:exists?) { true }
-        TryRb::Config.instance.stub(:tmp_dir) { project_path + '/tmp/tryrb' }
-        expect(FileUtils).to_not receive(:mkdir_p).with(project_path + '/tmp/tryrb')
-        TryRb::CLI.fullpath('bar')
-      end
-    end
-
-    context 'when there is a file which has same name with dir' do
-      it 'aborts' do
-        TryRb::Config.instance.stub(:tmp_dir) { project_path + '/tmp/foo/tryrb' }
-        FileUtils.touch project_path + '/tmp/foo'
-        expect(TryRb::CLI).to receive(:abort).with(/File .+ exists. The tmp directory can't be created! Please delete the file first./)
-        TryRb::CLI.fullpath('bar')
-      end
-    end
-  end
-
-  describe '#filename_prefix' do
-    it "return now string" do
-      expect(TryRb::CLI.filename_prefix).to eq("20140101000000")
-    end
-  end
-
-  describe '#get_filename' do
-    context 'when name is given' do
-      it 'returns string containing the name' do
-        expect(TryRb::CLI.get_filename('bar')).to eq('20140101000000_bar.rb')
-      end
-    end
-    context 'when name is not given' do
-      it 'returns just time string' do
-        expect(TryRb::CLI.get_filename(nil)).to eq('20140101000000.rb')
-      end
+      FileUtils.rm_rf 'tmp/foo'
+    end
+    it 'exec last file' do
+      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')
+      @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')
+      @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')
+      @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(:abort).with("Can't find the file you want")
+      @cli.exec
     end
   end
 end

data/tryrb.gemspec

@@ -16,4 +16,5 @@ Gem::Specification.new do |s|
   s.executables << 'tryrb'
   s.require_paths = ["lib"]
   s.homepage    = 'https://github.com/tony612/tryrb'
+  s.add_dependency 'thor'
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: tryrb
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Tony Han
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-02 00:00:00.000000000 Z
-dependencies: []
+date: 2014-01-07 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Try ruby code in a temporary file created.
 email: h.bing612@gmail.com
 executables: