projectionist 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16e6dea120ab5ed04934ba4eba2b806bb7914dae
-  data.tar.gz: 99bf7258097f2de499f3d8eea2efe394c8244223
+  metadata.gz: 9337be5a0c417da30876568ce0719dbd92a30f5a
+  data.tar.gz: 9f1270e59465fac5cd6c8203a185613c7cbc2276
 SHA512:
-  metadata.gz: c8999a092b56b9310d31d6165c6008e5fd1225829d233fc4324e25c71d41733a13dfd82f8abb07bd3335b34a342c1656f5379d36cb4339d380f954f337357c9c
-  data.tar.gz: dd76f78c31bcfad72340011197e8768edaa6add7022655fefa86e9d33e70b44430a16fba98083c3bf07827b726be13e651653d412bd48c238fdc43684d0180ae
+  metadata.gz: 5ae8010ff3493f48a983e760d4ad2f602c348b0c682108045fe313efd15aa0f3fbe5ed748ebb70836cff83e347498bb782374f926189136838a7792894ef5b9e
+  data.tar.gz: 17d734a911774efb1997b66a4d1f774bc9d24f5201ef73c538b48298fbe3c541a0f46525f958db7dd0990d8d649c84799d61fc3987f977c9263479357fac1e8e

data/.projections.json

@@ -1,4 +1,5 @@
 {
+    "README.md": { "type": "readme" },
     "lib/*.rb": {
         "type": "lib",
         "alternate": "spec/{}_spec.rb"

data/lib/projectionist/cli.rb

@@ -13,16 +13,23 @@ module Projectionist
       exit 1
     end
 
-    desc 'edit <type> <file>', 'Edit the file for <type> named <file>'
+    desc 'edit <type> [<file>]', 'Edit the file for <type> named <file>'
     option :editor
-    def edit(type, file)
+    def edit(type, file='')
       file = @projections.file_for type, file
       exec "#{editor} #{file}"
     end
 
-    desc 'list <type>', 'List all files for <type>'
+    desc 'list [-v|--verbose] <type>', 'List all files for <type>'
+    option :verbose, type: :boolean, aliases: '-v',
+      desc: "List full file paths instead of file names"
     def list(type)
-      puts @projections.files_for(type).join("\n")
+      puts @projections.files_for(type, verbose: options[:verbose]).join("\n")
+    end
+
+    desc 'types', 'List all types'
+    def types
+      puts @projections.types.join("\n")
     end
 
     no_commands do

data/lib/projectionist/projections.rb

@@ -3,11 +3,10 @@ require 'projectionist/errors'
 
 module Projectionist
   class Projections
-    attr_reader :types
     attr_reader :json_file_existed
 
     def initialize
-      @types = {}
+      @type_hash = {}
       load_file
     end
 
@@ -18,28 +17,42 @@ module Projectionist
         if glob.include? '**/*'
           raise Projectionist::ProjectionError, 'Globs may not include `**/*`'
         end
-        @types[options['type']] = options.merge('glob' => glob)
+        @type_hash[options['type']] = options.merge('glob' => glob)
       end
     end
 
     def type?(type)
-      @types.key?(type)
+      @type_hash.key?(type)
     end
 
-    def file_for(type, name)
+    def types
+      @type_hash.keys
+    end
+
+    def file_for(type, name='')
       return nil unless type? type
 
       Dir.chdir @basedir
-      glob = build_glob(@types[type]['glob'], name)
+      glob = build_glob(@type_hash[type]['glob'], name)
       file = Dir.glob(glob)[0]
       File.expand_path(file.nil? ? glob : file)
     end
 
-    def files_for(type)
+    def files_for(type, options = {})
       return [] unless type? type
-      glob = @types[type]['glob']
-      glob = glob.sub('/*', '/**/*') unless glob.include? '**'
-      Dir.glob(glob).map { |p| File.expand_path p }
+
+      glob = glob_for type
+      files = Dir.glob(glob)
+      files.map do |p|
+        if options[:verbose]
+          File.expand_path(p)
+        else
+          p.match(glob_to_regex glob) do |m|
+            components = m.captures.reject(&:empty?).map { |s| s.sub('/', '') }
+            components.join('/')
+          end
+        end
+      end
     end
 
     private
@@ -77,5 +90,18 @@ module Projectionist
         glob.sub(/\*/, file)
       end
     end
+
+    def glob_for(type)
+      glob = @type_hash[type]['glob']
+      glob = glob.sub('/*', '/**/*') unless glob.include? '**'
+      glob
+    end
+
+
+    def glob_to_regex(glob)
+      glob.match(/(.*)[*]{2}\/(.*)/) do |m|
+        m[1] + '([^\x00]*?)' + m[2].gsub('*', '([^/\x00]*?)')
+      end
+    end
   end
 end

data/lib/projectionist/version.rb

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

data/spec/projections_spec.rb

@@ -21,7 +21,7 @@ describe Projectionist::Projections do
     end
 
     it 'loads the list of types' do
-      expect(@projections.types.keys).to eq ['test']
+      expect(@projections.types).to eq ['test']
     end
 
     it 'has a method to check if a given type exists' do
@@ -46,7 +46,7 @@ describe Projectionist::Projections do
       end
 
       it 'still loads the file' do
-        expect(@projections.types.keys).to eq ['test']
+        expect(@projections.types).to eq ['test']
       end
 
       it 'still sets a flag that the file existed' do
@@ -76,8 +76,11 @@ describe Projectionist::Projections do
   end
 
   describe '#files_for' do
-    let(:test_dir)   { File.join(fixture_folder, 'test') }
-    let(:test_files) { (1..10).map { |n| File.join(test_dir, "#{n}_test.rb") } }
+    let(:test_dir)       { File.join(fixture_folder, 'test') }
+    let(:test_files) do
+      (1..10).map { |n| File.join(test_dir, "#{n}_test.rb") }
+    end
+    let(:test_filenames) { (1..10).map(&:to_s) }
 
     before do
       write_fixtures('test/*_test.rb' => { 'type' => 'test' })
@@ -96,7 +99,14 @@ describe Projectionist::Projections do
 
     context 'with a valid type' do
       it 'matches the correct files' do
-        expect(@projections.files_for 'test').to match_array(test_files)
+        expect(@projections.files_for 'test').to match_array(test_filenames)
+      end
+    end
+
+    context 'with verbose: true' do
+      it 'returns the full filepaths' do
+        expect(@projections.files_for 'test', verbose: true)
+          .to match_array(test_files)
       end
     end
 
@@ -107,8 +117,9 @@ describe Projectionist::Projections do
     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') }
+      let(:test_subdir)           { File.join(test_dir, 'subdir') }
+      let(:test_file_subdir)      { File.join(test_subdir, 'subdir_test.rb') }
+      let(:test_file_subdir_name) { 'subdir/subdir' }
       before do
         Dir.mkdir(test_subdir) unless Dir.exist? test_subdir
         File.open(test_file_subdir, 'w')
@@ -117,7 +128,7 @@ describe Projectionist::Projections do
       after { File.delete test_file_subdir }
 
       subject { @projections.files_for('test') }
-      it { is_expected.to include test_file_subdir }
+      it { is_expected.to include test_file_subdir_name }
     end
   end
 
@@ -196,5 +207,18 @@ describe Projectionist::Projections do
       subject { @projections.file_for 'test', 'foobar/file' }
       it { is_expected.to eq test_file }
     end
+
+    context 'with singleton projections' do
+      let(:singleton_file) { File.join(fixture_folder, 'README.md') }
+      before do
+        write_fixtures('README.md' => { 'type' => 'readme' })
+        File.open(singleton_file, 'w')
+        Dir.chdir fixture_folder
+        @projections.load_file
+      end
+
+      subject { @projections.file_for 'readme' }
+      it { is_expected.to eq singleton_file }
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: projectionist
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Griffin Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-25 00:00:00.000000000 Z
+date: 2014-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler