rb_tags 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31a65553f270a4c1fdf664e4a295c1b41f172984
-  data.tar.gz: 08bc92bb09cb9924fa9e5a2379dd913dc4d03afc
+  metadata.gz: da7bf6d417ead19868348089b51f7860b796c7ff
+  data.tar.gz: 51576d365b56280e9da7887d07fb7e7b05cdccc6
 SHA512:
-  metadata.gz: 63e08a431aa34560ea48ee7b8828206905badcf0bad6e0af7b933d99a41f1f8a9d5f8d2bf13b9abe2bd6d65343b0e859564f6ca810c7e41dda1a0a0c6816d891
-  data.tar.gz: 962b6f517599e90b9cd084fa555d20d3684aeb840c55279fcc1e0244074257caa11f931f76df8394ac6ad4942ea9e5dfc752e04b91f756e2df1a6a3606d28671
+  metadata.gz: 1e61f72619aaa01e06efe28510e0833624e0c4cbe3c5b16d91db36df07f903813dfc5e0031978b8b74d47bc530bc980f2e6c44cee0e669f45e570a6abd4ad8c4
+  data.tar.gz: d7461496821da150d5d8f8b6a42eea1b9948d98bb1c050427ff7a09c5c33b60903eed85f0ffa5aa1e5403c3ff3a0d3c77e5ee487591f3034424409665d792fd2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rb_tags (0.2.2)
+    rb_tags (0.3.0)
       awesome_print
       bundler
       colorize
@@ -15,8 +15,11 @@ GEM
   specs:
     awesome_print (1.6.1)
     blankslate (3.1.3)
+    byebug (5.0.0)
+      columnize (= 0.9.0)
     coderay (1.1.0)
     colorize (0.7.7)
+    columnize (0.9.0)
     diff-lcs (1.2.5)
     docile (1.1.5)
     ffi (1.9.10)
@@ -57,6 +60,9 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
+    pry-byebug (3.2.0)
+      byebug (~> 5.0)
+      pry (~> 0.10)
     rake (10.4.2)
     rb-fsevent (0.9.5)
     rb-inotify (0.9.5)
@@ -90,6 +96,8 @@ PLATFORMS
 DEPENDENCIES
   guard-bundler
   guard-rspec
+  pry
+  pry-byebug
   rb-fsevent
   rb_tags!
   rspec

data/bin/rb_tags

@@ -36,6 +36,8 @@ command :tag do |c|
   # switches
   c.desc 'tag also bundled gems'
   c.switch [:gems], :default_value => false
+  c.desc 'forces deleting of tag file before tagging'
+  c.switch [:force], :default_value => false
 
   c.action do |global_options,options,args|
     generate(options)

data/lib/rb_tags/concerns/yaml_tasks.rb

@@ -2,13 +2,17 @@ module YamlTasks
   # # WRITE
   def write_to_yaml(dir: nil, this: {})
     db = YAML::Store.new(store(dir), thread_safe: true)
-    db.transaction { db["tags"] = this } unless this.nil?
+    db.transaction { db["tags"] = this }
   end
 
   # # READ
-  def read_from_yaml_file(dir: nil)
-    db = YAML::Store.new(store(dir), thread_safe: true)
-    db.transaction { db.fetch("tags") }
+  def read_from_yaml(dir: nil)
+    begin
+      db = YAML::Store.new(store(dir), thread_safe: true)
+      db.transaction { db.fetch("tags") }
+    rescue Exception => e
+    end
+
   end
 
   private

data/lib/rb_tags/tags.rb

@@ -4,16 +4,16 @@ class Tags
 
   attr_reader :dir, :tags, :names
 
-  def initialize(dir = Dir.getwd, read: false)
-    @dir = dir
-    if read
-      self.read
-      self.names
-    end
+  def initialize(dir: Dir.getwd, force: false)
+    @dir = check(dir)
+
+    self.delete if force
+    self.read
   end
 
   def tag
     FileUtils.cd(@dir) { |dir| @tags = find_expressions(dir, @mask) }
+    save
   end
 
   def add(tags)
@@ -31,11 +31,23 @@ class Tags
   end
 
   def read
-    @tags = read_from_yaml_file(dir: @dir)
-    tag if @tags.nil?
+    @tags = read_from_yaml(dir: @dir)
+    tag if @tags.nil? || @tags.empty?
+  end
+
+  def delete
+    tag_file = File.join(@dir,".tags")
+    FileUtils.rm(tag_file) if File.exist?(tag_file)
   end
 
   def names
     @tags.keys
   end
+
+  def check(dir)
+    return dir if Dir.exist?(dir)
+    FileUtils.mkdir_p(dir)
+
+    dir
+  end
 end

data/lib/rb_tags/version.rb

@@ -1,3 +1,3 @@
 module RbTags
-  VERSION = '0.2.2'
+  VERSION = '0.3.0'
 end

data/lib/rb_tags.rb

@@ -31,7 +31,7 @@ module RbTags
   def generate(options={})
     default_options(options)
 
-    tags = Tags.new(@options[:dir])
+    tags = Tags.new(dir: @options[:dir], force: (@options[:gems] || @options[:force]))
     tags.tag
     if @options[:gems]
       result = tag_bundled_gems
@@ -45,29 +45,24 @@ module RbTags
     gem_list = build_gem_list
     results = ::Parallel.map(gem_list.each_slice(number_of_processors),
                              in_processes: number_of_processors) do |dir_list|
-      gem_list = Tags.new(dir_list.shift)
+
+      gem_list = Tags.new(dir: dir_list.shift)
       gem_list.tag
 
       dir_list.each do |dir|
-        gem_tags = Tags.new(dir, read: true)
-        unless !!gem_tags.tags
-          gem_tags.tag
-          gem_tags.save
-          say_tagging(gem_tags.dir)
-        end
+        gem_tags = Tags.new(dir: dir)
+        say_tagging(gem_tags.dir)
+        # p gem_tags.tags.length
         gem_list.add(gem_tags.tags)
       end
-
       gem_list
     end
-
     results
   end
 
   def say_tagging(dir)
     $stdout.print "tag gem: ".blue
-    $stdout.print "#{dir}".colorize(:yellow_light)
-    $stdout.print " first time\n".blue
+    $stdout.print "#{dir}\n".colorize(:yellow_light)
   end
 
   #
@@ -76,7 +71,7 @@ module RbTags
 
   # get list of all names of methods/classes/modules
   def tags
-    @tags ||= Tags.new(read: true)
+    @tags ||= Tags.new(force: false)
     @tags.names
   end
 
@@ -129,7 +124,7 @@ module RbTags
   end
 
   def defaults
-    { gems: false }
+    { gems: false, force: false }
   end
 
   def default_dir
@@ -140,6 +135,8 @@ module RbTags
     # :nocov:
     file_line = "#{selected[:line]} #{selected[:path]}"
     case editor
+    when 'atom'
+      `atom #{file_line}`
     when 'mate'
       `mate -l #{file_line}`
     when 'emacs'

data/rb_tags.gemspec

@@ -26,6 +26,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "guard-bundler"
   spec.add_development_dependency "rb-fsevent"
   spec.add_development_dependency "terminal-notifier-guard"
+  spec.add_development_dependency "pry"
+  spec.add_development_dependency "pry-byebug"
 
   spec.add_runtime_dependency "awesome_print"
   spec.add_runtime_dependency "bundler"

data/spec/rb_tags/concerns/yaml_tasks_spec.rb

@@ -1,20 +1,43 @@
 describe YamlTasks do
+  after(:each) do
+    tag_file = File.join(Dir.getwd,'.tags')
+    FileUtils.rm(tag_file) if File.exist?(tag_file)
+  end
+
   subject { described_class }
 
   it { expect(subject.name).to eq 'YamlTasks' }
 
-  describe '#store' do
+  describe 'include methods' do
     subject { Class.include described_class }
-    describe 'default dir' do
-      let(:store) { subject.send(:store) }
 
-      it { expect(store).to eq File.join(Dir.getwd,'.tags') }
+    describe '#write_to_yaml' do
+      it { expect{ subject.write_to_yaml(this: {}) }.not_to raise_error }
+    end
+
+    describe '#read_from_yaml' do
+
+      it { expect{ subject.read_from_yaml }.not_to raise_error }
+      it 'does something' do
+        subject.write_to_yaml(this: {foo: "bar"} )
+        expect{ subject.read_from_yaml }.not_to raise_error
+        expect(subject.read_from_yaml).not_to be nil
+      end
     end
 
-    describe 'dir given' do
-      let(:store) { subject.send(:store, '/somewhere') }
+    describe '#store' do
+      describe 'default dir' do
+        let(:store) { subject.send(:store) }
+
+        it { expect(store).to eq File.join(Dir.getwd,'.tags') }
+      end
 
-      it { expect(store).to eq File.join('/somewhere',".tags") }
+      describe 'dir given' do
+        let(:store) { subject.send(:store, '/somewhere') }
+
+        it { expect(store).to eq File.join('/somewhere',".tags") }
+      end
     end
   end
+
 end

data/spec/rb_tags/tags_spec.rb

@@ -1,5 +1,5 @@
 describe Tags do
-  after(:all) do
+  after(:each) do
     tag_file = File.join(Dir.getwd,'.tags')
     FileUtils.rm(tag_file) if File.exist?(tag_file)
   end
@@ -14,11 +14,20 @@ describe Tags do
 
   describe 'defaults' do
     it { expect(subject.dir).to eq Dir.getwd }
-  end
 
-  describe 'with params' do
-    subject { Tags.new('.')}
-    it { expect(subject.dir).to eq '.' }
+    describe '#check dir' do
+      let(:to_create_dir) { File.join(Dir.getwd, 'spec','what') }
+
+      it 'create dirs' do
+        subject.check(to_create_dir)
+        expect(Dir.exist?(to_create_dir)).to be true
+      end
+    end
+
+    describe 'with params' do
+      subject { Tags.new(dir: './wo')}
+      it { expect(subject.dir).to eq './wo' }
+    end
   end
 
   describe '#tag' do
@@ -32,7 +41,7 @@ describe Tags do
     end
 
     it 'tags specified directory' do
-      subject = Tags.new(FileUtils.pwd)
+      subject = Tags.new(dir: FileUtils.pwd)
       subject.tag
       expect(subject.tags.length).to be > 1
       expect(subject.tags).to be_a Hash
@@ -54,7 +63,6 @@ describe Tags do
     it { expect { subject.read }.not_to raise_error }
     it 'do it' do
       subject.tag
-      subject.save
       tag_file = File.join(subject.dir, '.tags')
       expect(File.exist?(tag_file)).to eq true
       object = Tags.new
@@ -75,7 +83,7 @@ describe Tags do
 
     it 'has greater length, if not equal' do
       dir = Bundler.load.specs.map(&:full_gem_path).last
-      compare = Tags.new(dir)
+      compare = Tags.new(dir: dir)
       subject.tag
       compare.tag
       subject.add(compare.tags)
@@ -88,4 +96,19 @@ describe Tags do
     it { expect(subject.names).to be_a Array }
     it { expect(subject.names.first).to be_a String }
   end
+
+  describe '#delete' do
+    before do
+      subject = Tags.new(dir: FileUtils.pwd)
+      subject.tag
+    end
+
+    it 'tag file' do
+      expect(subject).to receive(:delete)
+      subject.delete
+      tag_file = File.join(subject.dir, '.tags')
+
+      expect(Dir.exist?(tag_file)).to be false
+    end
+  end
 end

data/spec/rb_tags_spec.rb

@@ -42,7 +42,7 @@ describe RbTags do
       before { foo.tags }
 
       describe '#tags' do
-        let(:tag_tags) { Tags.new(read: true).names}
+        let(:tag_tags) { Tags.new(force: true).names}
 
         it 'has tags' do
           expect(foo.tags).to eq tag_tags
@@ -50,7 +50,7 @@ describe RbTags do
       end
 
       describe '#complete_tag' do
-        let(:tag) { Tags.new(read: true).tags}
+        let(:tag) { Tags.new(force: true).tags}
         let(:arg) { tag.first.first }
 
         before do
@@ -64,7 +64,7 @@ describe RbTags do
       end
 
       describe '#found' do
-        let(:tag) { Tags.new(read: true).tags.first}
+        let(:tag) { Tags.new(force: true).tags.first}
         let(:key) { tag.first }
 
         it 'does something' do
@@ -96,7 +96,7 @@ describe RbTags do
         describe 'defaults' do
           let(:tags) { foo.send(:default_options, {})}
           let(:defaults) { foo.send(:defaults) }
-          let(:default) { {gems: false, dir: Dir.getwd} }
+          let(:default) { {gems: false, dir: Dir.getwd, force: false} }
 
           it { expect { tags }.to_not raise_error }
           it { expect(tags).to eq default }
@@ -108,7 +108,7 @@ describe RbTags do
         end
 
         describe 'set gems' do
-          let(:options) { {gems: true, dir: '/somewhere'} }
+          let(:options) { {gems: true, dir: '/somewhere', force: false} }
           let(:tag_w_options) { foo.send(:default_options, options)}
           it { expect(tag_w_options).to eq options }
         end
@@ -116,7 +116,7 @@ describe RbTags do
         describe 'from gli' do
           let(:income) { { "dir" => "..", :dir => "..", "save" => true, :save => true, "gems" => true, :read  => false } }
           let(:options) { foo.send(:default_options, income)}
-          let(:expected) { { :dir => "..", :save => true, :gems => true, :read  => false } }
+          let(:expected) { { :dir => "..", :save => true, :gems => true, :read  => false, force: false } }
 
           it { expect(options).to eq expected }
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rb_tags
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - LeFnord
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-19 00:00:00.000000000 Z
+date: 2015-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -80,6 +80,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement