noir 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 321b15d42d793bbc446da53068990490c43d1d53
-  data.tar.gz: 958e080bde8a7e4aba828cef99ad0587b774b869
+  metadata.gz: 87a92fb27d6501f841713ec7f5972152c1df2b02
+  data.tar.gz: 3b4585476354ecdee659faf9c14f00f8fc89ff71
 SHA512:
-  metadata.gz: 047e554c78f92f237badf491e967d86c8a8af8edb89938f0cc9350dc1c39376f2e7d841dd6481fb648aee8107ba65f10b0c7ac6b823bbcd3e9c54e99d34477ee
-  data.tar.gz: fc30d7f7a8890a13a01fafeca7ec82e1a8984b044224c83cb003ce86136008ac9ecec46833e8898c4540574186be68eb8bb54a23f153ce286fdac7747e5bde85
+  metadata.gz: 730faf4b77365e52fa48aac8cd44b5de86678ebac29cbadabc4ce158c66232d7c4caef1ba26cda40479b09b5a08033a6fd714775a1a87e49ab62d6e9d514009b
+  data.tar.gz: c4dd7f89a0f889d030737bfba74ccb43bc6f1ef11a74eeb7ec5bf792a951851af5b2e0bd8536ac06b829c5f4c59565adc4cc772a43c964b94a65d383746a9b83

data/lib/noir.rb

@@ -7,7 +7,6 @@ require 'noir/command'
 
 module Noir
   def self.main
-    Noir::Options.parse_options_from_argv!
     Noir::Executer.execute
   end
 end

data/lib/noir/base/command.rb

@@ -27,7 +27,10 @@ module Noir::Base
 
       def sub_commands
         consts = constants - superclass.constants
-        consts = consts.select{|c| const_get(c).ancestors.include?(Noir::Base::Command)}
+        consts = consts.select do |const|
+          const_get(const).class == Class &&
+          const_get(const).ancestors.include?(Noir::Base::Command)
+        end
       end
 
       def check_command_not_found command=nil, *args

data/lib/noir/base/terminal_command.rb

@@ -11,6 +11,10 @@ module Noir::Base
         raise 'please override in extended class'
       end
 
+      def sub_commands
+        return []
+      end
+
     end
 
   end

data/lib/noir/command/completion.rb

@@ -5,10 +5,6 @@ class Noir::Command::Completion < Noir::Base::TerminalCommand
   class << self
 
     def execute *args
-      if Noir::Options.exist? Noir::Options::Help
-        description
-        exit
-      end
       puts suggestions(args)
     end
 

data/lib/noir/command/edit/weekly_report/friday.rb

@@ -1,5 +1,5 @@
 class Noir::Command::Edit::WeeklyReport::Friday < Noir::Base::TerminalCommand
-  @describe = 'edit weekly report separated by friday'
+  @description = 'edit weekly report separated by friday'
 
   class << self
     def execute *args

data/lib/noir/command/edit/weekly_report/monday.rb

@@ -1,5 +1,5 @@
 class Noir::Command::Edit::WeeklyReport::Monday < Noir::Base::TerminalCommand
-  @describe = 'edit weekly report separated by monday'
+  @description = 'edit weekly report separated by monday'
 
   class << self
     def execute *args

data/lib/noir/command/edit/weekly_report/saturday.rb

@@ -1,5 +1,5 @@
 class Noir::Command::Edit::WeeklyReport::Saturday < Noir::Base::TerminalCommand
-  @describe = 'edit weekly report separated by saturday'
+  @description = 'edit weekly report separated by saturday'
 
   class << self
     def execute *args

data/lib/noir/command/edit/weekly_report/sunday.rb

@@ -1,5 +1,5 @@
 class Noir::Command::Edit::WeeklyReport::Sunday < Noir::Base::TerminalCommand
-  @describe = 'edit weekly report separated by sunday'
+  @description = 'edit weekly report separated by sunday'
 
   class << self
     def execute *args

data/lib/noir/command/edit/weekly_report/thursday.rb

@@ -1,5 +1,5 @@
 class Noir::Command::Edit::WeeklyReport::Thursday < Noir::Base::TerminalCommand
-  @describe = 'edit weekly report separated by thursday'
+  @description = 'edit weekly report separated by thursday'
 
   class << self
     def execute *args

data/lib/noir/command/edit/weekly_report/tuesday.rb

@@ -1,5 +1,5 @@
 class Noir::Command::Edit::WeeklyReport::Tuesday < Noir::Base::TerminalCommand
-  @describe = 'edit weekly report separated by tuesday'
+  @description = 'edit weekly report separated by tuesday'
 
   class << self
     def execute *args

data/lib/noir/command/edit/weekly_report/wednesday.rb

@@ -1,5 +1,5 @@
 class Noir::Command::Edit::WeeklyReport::Wednesday < Noir::Base::TerminalCommand
-  @describe = 'edit weekly report separated by wednesday'
+  @description = 'edit weekly report separated by wednesday'
 
   class << self
     def execute *args

data/lib/noir/command/new.rb

@@ -1,5 +1,14 @@
 class Noir::Command::New < Noir::Base::Command
   @description = 'Create new files'
+
+  def self.createFile filename, text=''
+    File.open(filename, 'w') do |file|
+      file.write(text.sub(/^\n/, ''))
+    end
+  end
+
 end
 
 require 'noir/command/new/note'
+require 'noir/command/new/gitignore'
+require 'noir/command/new/makefile'

data/lib/noir/command/new/gitignore.rb

@@ -0,0 +1,13 @@
+class Noir::Command::New::GitIgnore < Noir::Base::Command
+  @description = 'Create new .gitignore'
+
+  GitIgnoreName = '.gitignore'
+
+  def self.createGitIgnore text
+    Noir::Command::New.createFile(GitIgnoreName, text)
+  end
+
+end
+
+require 'noir/command/new/gitignore/vim'
+require 'noir/command/new/gitignore/tex'

data/lib/noir/command/new/gitignore/tex.rb

@@ -0,0 +1,19 @@
+class Noir::Command::New::GitIgnore::Tex < Noir::Base::TerminalCommand
+  @description = 'Create new .gitignore for TeX'
+
+  GitIgnoreText = %q(
+*.swp
+
+*.log
+*.aux
+*.dvi
+*.pdf
+*.toc
+)
+
+  def self.execute *args
+    Noir::Command::New::GitIgnore.createGitIgnore GitIgnoreText
+  end
+
+end
+

data/lib/noir/command/new/gitignore/vim.rb

@@ -0,0 +1,13 @@
+class Noir::Command::New::GitIgnore::Vim < Noir::Base::TerminalCommand
+  @description = 'Create new .gitignore for vim'
+
+  GitIgnoreText = %q(
+*.swp
+)
+
+  def self.execute *args
+    Noir::Command::New::GitIgnore.createGitIgnore GitIgnoreText
+  end
+
+end
+

data/lib/noir/command/new/makefile.rb

@@ -0,0 +1,11 @@
+class Noir::Command::New::Makefile < Noir::Base::Command
+  @description = 'Create new Makefile'
+
+  MakefileName = 'Makefile'
+
+  def self.createMakefile text
+    Noir::Command::New.createFile(MakefileName, text)
+  end
+end
+
+require 'noir/command/new/makefile/tex'

data/lib/noir/command/new/makefile/tex.rb

@@ -0,0 +1,34 @@
+class Noir::Command::New::Makefile::Tex < Noir::Base::TerminalCommand
+  @description = 'Create new Makefile for TeX'
+
+  MakefileText = %q(
+# target name
+TARGET=<tex_file_name_without_extension>
+
+# dependencies
+$(TARGET).pdf : $(TARGET).dvi
+	dvipdfmx $<
+
+$(TARGET).dvi : $(wildcard **/*.tex) $(TARGET).tex
+	platex $(TARGET).tex
+	platex $(TARGET).tex
+	platex $(TARGET).tex
+
+# commands
+.PHONY : all open clean
+
+all : $(TARGET).pdf
+
+open : $(TARGET).pdf
+	open $(TARGET).pdf
+
+clean:
+	rm -f *.dvi *.aux *.log *.pdf *.ps *.gz *.bbl *.blg *.toc *~ *.core
+)
+
+  def self.execute *args
+    Noir::Command::New::Makefile.createMakefile MakefileText
+  end
+
+end
+

data/lib/noir/command/new/note.rb

@@ -1,5 +1,4 @@
 require 'date'
-require 'fileutils'
 
 class Noir::Command::New::Note < Noir::Base::TerminalCommand
   @description = 'create empty txt. filename format is <serial-no>_<date>.txt'
@@ -9,7 +8,8 @@ class Noir::Command::New::Note < Noir::Base::TerminalCommand
     def execute *args
       note_num  = Dir.glob('[0-9]*_????????.txt').size + 1
       note_name = format("%02d", note_num) + '_' + Time.now.strftime('%Y%m%d') + '.txt'
-      FileUtils.touch(note_name)
+      Noir::Command::New.createFile note_name
+      puts note_name
     end
 
   end

data/lib/noir/executer.rb

@@ -6,19 +6,12 @@ module Noir
     def self.find_command command_arr, search_str
       command = eval(command_arr.join('::'))
 
-      # finish find by terminal command
-      return nil if command.superclass == Noir::Base::TerminalCommand
-
-      commands    = command.constants(true).map(&:to_s)
+      commands    = command.sub_commands.map(&:to_s)
       matched_str = commands.find{|c| c.downcase == search_str.downcase}
       matched_str = find_abbr_command(commands, search_str) if matched_str.nil?
 
       return nil if matched_str.nil?
       matched_arr = command_arr + [matched_str]
-      unless eval(matched_arr.join('::')).ancestors.include?(Noir::Base::Command)
-        # matched. but matched class is not inherited commmand
-        return nil
-      end
 
       return matched_str
     end
@@ -60,6 +53,12 @@ module Noir
     # inherited methods
 
     def self.execute
+      Noir::Options.parse_options_from_argv!
+
+      if Noir::Options.exist? Noir::Options::Help
+        return command_from_argv.description
+      end
+
       command_from_argv.execute *args_from_argv
     end
 

data/lib/noir/version.rb

@@ -1,3 +1,3 @@
 module Noir
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/noir.gemspec

@@ -18,6 +18,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.required_ruby_version = '>= 1.9.2'
+
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake",    "10.1.1"
   spec.add_development_dependency "rspec",   "3.0.0.beta2"

data/spec/noir/command/new/gitignore/tex_spec.rb

@@ -0,0 +1,8 @@
+require 'noir'
+require 'spec_helper'
+
+describe 'Noir::Command::New::GitIgnore::Tex' do
+  it 'is TerminalCommand' do
+    expect(Noir::Command::New::GitIgnore::Tex.superclass).to eq(Noir::Base::TerminalCommand)
+  end
+end

data/spec/noir/command/new/gitignore/vim_spec.rb

@@ -0,0 +1,10 @@
+require 'noir'
+require 'spec_helper'
+
+describe 'Noir::Command::New::GitIgnore::Vim' do
+  it 'is TerminalCommand' do
+    expect(Noir::Command::New::GitIgnore::Vim.superclass).to eq(Noir::Base::TerminalCommand)
+  end
+end
+
+

data/spec/noir/command/new/gitignore_spec.rb

@@ -0,0 +1,9 @@
+require 'noir'
+require 'spec_helper'
+
+describe 'Noir::Command::New::GitIgnore' do
+  it 'is Command' do
+    expect(Noir::Command::New::GitIgnore.superclass).to eq(Noir::Base::Command)
+  end
+end
+

data/spec/noir/command/new/makefile/tex_spec.rb

@@ -0,0 +1,9 @@
+require 'noir'
+require 'spec_helper'
+
+describe 'Noir::Command::New::Makefile::Tex' do
+  it 'is TerminalCommand' do
+    expect(Noir::Command::New::Makefile::Tex.superclass).to eq(Noir::Base::TerminalCommand)
+  end
+end
+

data/spec/noir/command/new/makefile_spec.rb

@@ -0,0 +1,10 @@
+require 'noir'
+require 'spec_helper'
+
+describe 'Noir::Command::New::Makefile' do
+  it 'is Command' do
+    expect(Noir::Command::New::Makefile.superclass).to eq(Noir::Base::Command)
+  end
+end
+
+

data/spec/noir/executer_spec.rb

@@ -204,4 +204,30 @@ describe 'Noir::Executer' do
     end # in defined argv
 
   end # args_from_argv
+
+  describe 'execute' do
+    let(:mock_command) { double('Noir::Base::Command') }
+
+    before do
+      stub_const 'Noir::Executer', Noir::Executer
+      allow(Noir::Executer).to receive(:command_from_argv).and_return(mock_command)
+
+      allow(mock_command).to receive(:execute).and_return(:call_execute)
+      allow(mock_command).to receive(:description).and_return(:call_description)
+    end
+
+    it 'not has help flag. execute command.execute' do
+      expect(Noir::Executer.execute).to eq(:call_execute)
+    end
+
+    it 'has help option. execute command.describe' do
+      stub_const 'ARGV', ['-h']
+      expect(Noir::Executer.execute).to eq(:call_description)
+    end
+
+    it 'has log help option. execute command.describe' do
+      stub_const 'ARGV', ['--help']
+      expect(Noir::Executer.execute).to eq(:call_description)
+    end
+  end # execute
 end

data/spec/noir/noir/base/command_spec.rb

@@ -54,6 +54,7 @@ describe 'Noir::Base::Command' do
         stub_const('Hoge::SubCommand'                   , Class.new(Noir::Base::Command))
         stub_const('Hoge::SubCommand::SubSubCommand'    , Class.new(Noir::Base::Command))
         stub_const('Hoge::SubCommand::SubSubNonCommand' , Class.new)
+        stub_const('Hoge::SubCommand::NotCommand'       , :not_command)
         stub_const('Hoge::SubCommandTwo'                , Class.new(Noir::Base::Command))
         stub_const('Hoge::SubNonCommand'                , Class.new)
 
@@ -112,6 +113,10 @@ describe 'Noir::Base::Command' do
           expect(@commands).not_to include(:SubCommand)
         end
 
+        it 'not include non class const' do
+          expect(@commands).not_to include(:not_command)
+        end
+
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: noir
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - atton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-13 00:00:00.000000000 Z
+date: 2014-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -85,6 +85,11 @@ files:
 - lib/noir/command/init.rb
 - lib/noir/command/init/zsh.rb
 - lib/noir/command/new.rb
+- lib/noir/command/new/gitignore.rb
+- lib/noir/command/new/gitignore/tex.rb
+- lib/noir/command/new/gitignore/vim.rb
+- lib/noir/command/new/makefile.rb
+- lib/noir/command/new/makefile/tex.rb
 - lib/noir/command/new/note.rb
 - lib/noir/executer.rb
 - lib/noir/options.rb
@@ -103,6 +108,11 @@ files:
 - spec/noir/command/help_spec.rb
 - spec/noir/command/init/zsh_spec.rb
 - spec/noir/command/init_spec.rb
+- spec/noir/command/new/gitignore/tex_spec.rb
+- spec/noir/command/new/gitignore/vim_spec.rb
+- spec/noir/command/new/gitignore_spec.rb
+- spec/noir/command/new/makefile/tex_spec.rb
+- spec/noir/command/new/makefile_spec.rb
 - spec/noir/command/new/note_spec.rb
 - spec/noir/command/new_spec.rb
 - spec/noir/command_spec.rb
@@ -125,7 +135,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -151,6 +161,11 @@ test_files:
 - spec/noir/command/help_spec.rb
 - spec/noir/command/init/zsh_spec.rb
 - spec/noir/command/init_spec.rb
+- spec/noir/command/new/gitignore/tex_spec.rb
+- spec/noir/command/new/gitignore/vim_spec.rb
+- spec/noir/command/new/gitignore_spec.rb
+- spec/noir/command/new/makefile/tex_spec.rb
+- spec/noir/command/new/makefile_spec.rb
 - spec/noir/command/new/note_spec.rb
 - spec/noir/command/new_spec.rb
 - spec/noir/command_spec.rb