projectionist 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6d516e8da9c41857b4ccabac75f9fd33c1af027
-  data.tar.gz: 20a1755d7801fd40f3a02a70932aba96c940142b
+  metadata.gz: 16e6dea120ab5ed04934ba4eba2b806bb7914dae
+  data.tar.gz: 99bf7258097f2de499f3d8eea2efe394c8244223
 SHA512:
-  metadata.gz: 82a89e17bd7a518f3a358174996ce649c487740c88b932109de623d2dd0e3a4ed4bb78911ecab707920ac69ba33f071538ee79bf25ff732bd466aee2c4890339
-  data.tar.gz: 370a88d3fcb609bc182fc374f0e743d76ee534d5df0d87ff019f81bae22e1e8201f2d24d7c1f159960405d1dc1c8857c4fa016e6fe2cd5d7785a127c322ccab4
+  metadata.gz: c8999a092b56b9310d31d6165c6008e5fd1225829d233fc4324e25c71d41733a13dfd82f8abb07bd3335b34a342c1656f5379d36cb4339d380f954f337357c9c
+  data.tar.gz: dd76f78c31bcfad72340011197e8768edaa6add7022655fefa86e9d33e70b44430a16fba98083c3bf07827b726be13e651653d412bd48c238fdc43684d0180ae

data/.projections.json

@@ -1,5 +1,6 @@
 {
-    "lib/**/*.rb": {
-        "type": "lib"
+    "lib/*.rb": {
+        "type": "lib",
+        "alternate": "spec/{}_spec.rb"
     }
 }

data/README.md

@@ -5,7 +5,7 @@
 
 # Projectionist 
 
-Command-line interface to the [.projections.json](https://github.com/tpope/vim-projectionist) format - WIP
+Quickly edit project files using the [.projections.json](https://github.com/tpope/vim-projectionist) format
 
 ## Installation
 
@@ -29,12 +29,5 @@ The command to edit `lib/whatever/test.rb` would be:
 
     $ prj edit lib whatever/test
 
-
-## Contributing
-
-1. [Fork it](https://github.com/glittershark/projectionist/fork)
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create a new Pull Request
+Note that there are two glob components here - `**` and `*`. When editing files, these components are separated by a `/`
 

data/lib/projectionist.rb

@@ -1,6 +1,7 @@
 require 'projectionist/version'
 require 'projectionist/projections'
 require 'projectionist/cli'
+require 'projectionist/errors'
 
 module Projectionist
 end

data/lib/projectionist/cli.rb

@@ -8,19 +8,28 @@ module Projectionist
     def initialize(*)
       @projections = Projectionist::Projections.new
       super
+    rescue Projectionist::ProjectionError => error
+      $stderr.puts "ERROR: #{error.message}"
+      exit 1
     end
 
     desc 'edit <type> <file>', 'Edit the file for <type> named <file>'
     option :editor
     def edit(type, file)
-      editor = options[:editor] || ENV['EDITOR'] || `which vim`
       file = @projections.file_for type, file
-      exec editor, file
+      exec "#{editor} #{file}"
     end
 
     desc 'list <type>', 'List all files for <type>'
     def list(type)
       puts @projections.files_for(type).join("\n")
     end
+
+    no_commands do
+      def editor
+        editor = options[:editor] || ENV['VISUAL'] || ENV['EDITOR'] || 'vim'
+        editor.empty? ? 'vim' : editor
+      end
+    end
   end
 end

data/lib/projectionist/errors.rb

@@ -0,0 +1,4 @@
+module Projectionist
+  class ProjectionError < Exception
+  end
+end

data/lib/projectionist/projections.rb

@@ -1,4 +1,5 @@
 require 'json'
+require 'projectionist/errors'
 
 module Projectionist
   class Projections
@@ -14,6 +15,9 @@ module Projectionist
       @json = get_json path
       @json.each do |glob, options|
         next unless options.key? 'type'
+        if glob.include? '**/*'
+          raise Projectionist::ProjectionError, 'Globs may not include `**/*`'
+        end
         @types[options['type']] = options.merge('glob' => glob)
       end
     end
@@ -33,7 +37,9 @@ module Projectionist
 
     def files_for(type)
       return [] unless type? type
-      Dir.glob(@types[type]['glob']).map { |p| File.expand_path p }
+      glob = @types[type]['glob']
+      glob = glob.sub('/*', '/**/*') unless glob.include? '**'
+      Dir.glob(glob).map { |p| File.expand_path p }
     end
 
     private
@@ -63,9 +69,13 @@ module Projectionist
     def build_glob(glob, file)
       # Split the passed file by `/`, then replace all globs that use `*` or
       # `**` with components of the passed file, in order
-      file_components = file.split('/')
-      glob_components = glob.split(/\*+/)
-      glob_components.zip(file_components).flatten.compact.join('')
+      if glob.include? '**'
+        file_components = file.split('/')
+        glob_components = glob.split(/\*+/)
+        glob_components.zip(file_components).flatten.compact.join('')
+      else
+        glob.sub(/\*/, file)
+      end
     end
   end
 end

data/lib/projectionist/version.rb

@@ -1,3 +1,3 @@
 module Projectionist
-  VERSION = '0.1.2'
+  VERSION = '0.2.0'
 end

data/spec/projections_spec.rb

@@ -66,21 +66,28 @@ describe Projectionist::Projections do
         expect(@projections.json_file_existed).to be false
       end
     end
+
+    context 'with `**/*` in projections' do
+      before { write_fixtures('test/**/*.rb' => { 'type' => 'disallowed' }) }
+      it 'raises an error' do
+        expect { @projections.load_file }.to raise_error Projectionist::ProjectionError
+      end
+    end
   end
 
   describe '#files_for' do
     let(:test_dir)   { File.join(fixture_folder, 'test') }
-    let(:test_files) { (1..10).map { |n| File.join(test_dir, "test_#{n}.rb") } }
+    let(:test_files) { (1..10).map { |n| File.join(test_dir, "#{n}_test.rb") } }
 
     before do
-      write_fixtures('test/test_*.rb' => { 'type' => 'test' })
+      write_fixtures('test/*_test.rb' => { 'type' => 'test' })
       Dir.mkdir(test_dir) unless Dir.exist? test_dir
 
       test_files.each { |f| File.open(f, 'w') }
 
       # make bad test files as well
       5.times do |n|
-        file = File.join(test_dir, "bad_#{n}.rb")
+        file = File.join(test_dir, "#{n}_bad.rb")
         File.open(file, 'w')
       end
 
@@ -98,6 +105,20 @@ describe Projectionist::Projections do
         expect(@projections.files_for 'toast').to eq []
       end
     end
+
+    context 'with files in child directories' do
+      let(:test_subdir)      { File.join(test_dir, 'subdir') }
+      let(:test_file_subdir) { File.join(test_subdir, 'subdir_test.rb') }
+      before do
+        Dir.mkdir(test_subdir) unless Dir.exist? test_subdir
+        File.open(test_file_subdir, 'w')
+      end
+
+      after { File.delete test_file_subdir }
+
+      subject { @projections.files_for('test') }
+      it { is_expected.to include test_file_subdir }
+    end
   end
 
   describe '#file_for' do
@@ -142,6 +163,18 @@ describe Projectionist::Projections do
         end
       end
 
+      context 'with files in child directories' do
+        let(:test_subdir)      { File.join(test_dir, 'subdir') }
+        let(:test_file_subdir) { File.join(test_subdir, 'file.rb') }
+        before do
+          Dir.mkdir(test_subdir) unless Dir.exist? test_subdir
+          File.open(test_file_subdir, 'w')
+        end
+
+        subject { @projections.file_for('test', 'subdir/file') }
+        it { is_expected.to eq test_file_subdir }
+      end
+
       context 'in a child directory' do
         before { Dir.chdir test_dir }
         subject { @projections.file_for('test', 'file') }
@@ -149,7 +182,7 @@ describe Projectionist::Projections do
       end
     end
 
-    context 'with multi-level globs' do
+    context 'with advanced globs' do
       let(:test_dir)  { File.join(fixture_folder, 'test', 'foobar') }
       let(:test_file) { File.join(test_dir, 'test_file.rb') }
       before do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: projectionist
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Griffin Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-23 00:00:00.000000000 Z
+date: 2014-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -107,6 +107,7 @@ files:
 - bin/prj
 - lib/projectionist.rb
 - lib/projectionist/cli.rb
+- lib/projectionist/errors.rb
 - lib/projectionist/projections.rb
 - lib/projectionist/version.rb
 - projectionist.gemspec