munge 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3e1eb8424b81b08cb185b26e80273a94ff027f5
-  data.tar.gz: eb0dbd0f3a65fbd4ce2ab8b5e8aacc48158ee03c
+  metadata.gz: c0a3b52e10d621eb9279d8e67047237914533a18
+  data.tar.gz: 772664c0d20c42a8ebc98bf158cef506429b73cf
 SHA512:
-  metadata.gz: fc9abaedb2d419a05eb69b45e14702e88438162df849749daa1b968b3617a6f271e5a4c89985a65adcf0c2ec2bebf5dc32298940bf9ac9e2bde95637eb8dd8e3
-  data.tar.gz: 814114a8a51a3e298687569cc7effde92cfb872304761633cf0df035c06f71734a7b4f6e672c009c0333627f2ea18f79c8cfc0147eb06b3bfb53806efda4f1cb
+  metadata.gz: 146e9511c1b41e8326657a16e20993fc44506d35b784194e8c182a2c60d0f1744a7ea85a222320ed28eb038b99e8ef9093996f7860058c377815fdeeaf7a2439
+  data.tar.gz: 77d5320774df65fd79e61dc417f2a9a4c7fd3856da5654b7055553d56d9607bbd93f3d98b9b83bd1981d178bb4330235a1f2ae3bcd75554ab6d43843a809f161

data/lib/munge/cli/commands/update.rb

@@ -15,7 +15,7 @@ module Munge
         end
 
         def call
-          directory("config", File.expand_path("config", destination_root))
+          directory("lib", File.expand_path("lib", destination_root))
           copy_file("setup.rb")
         end
       end

data/lib/munge/cli/dispatch.rb

@@ -55,6 +55,9 @@ module Munge
 
       def bootloader
         Munge::Bootloader.new(root_path: current_working_directory)
+      rescue Munge::Errors::ConfigYmlNotFound => e
+        puts e.message
+        exit
       end
 
       def symbolized_options

data/lib/munge/errors.rb

@@ -0,0 +1,77 @@
+module Munge
+  module Errors
+    class Base < StandardError
+    end
+
+    module ErrorWithIdentifier
+      def initialize(identifier)
+        @identifier = identifier
+      end
+    end
+
+    class DoubleWriteError < Base
+      include ErrorWithIdentifier
+
+      def message
+        "attempted to write #{@identifier} twice"
+      end
+    end
+
+    class DuplicateItemError < Base
+      include ErrorWithIdentifier
+
+      def message
+        "item with id `#{@identifier}` already exists"
+      end
+    end
+
+    class ItemNotFoundError < Base
+      include ErrorWithIdentifier
+
+      def message
+        "item not found (#{@identifier})"
+      end
+    end
+
+    class ItemHasNoRouteError < Base
+      include ErrorWithIdentifier
+
+      def message
+        "item `#{@identifier}` has no route"
+      end
+    end
+
+    class DuplicateTransformerError < Base
+      include ErrorWithIdentifier
+
+      def message
+        "already registered transformer `#{@identifier}`"
+      end
+    end
+
+    class TransformerNotFoundError < Base
+      include ErrorWithIdentifier
+
+      def message
+        "transformer `#{@identifier}` is not installed"
+      end
+    end
+
+    class InvalidRouterError < Base
+      include ErrorWithIdentifier
+
+      def message
+        "invalid router with type #{@identifier}"
+      end
+    end
+
+    class ConfigYmlNotFound < Base
+      include ErrorWithIdentifier
+
+      def message
+        "Expected to find config file: #{@identifier}\n" \
+        "Are you in the correct directory, or did you run `munge init`?"
+      end
+    end
+  end
+end

data/lib/munge/init.rb

@@ -24,9 +24,9 @@ module Munge
       @app.items.freeze
     end
 
-    # @return [String] path to user's `config/` directory
-    def config_path
-      File.join(root_path, "config")
+    # @return [String] path to user's `lib/` directory
+    def lib_path
+      File.join(root_path, "lib")
     end
 
     # Loads file into current scope. Similar to `load "filename.rb"`

data/lib/munge/runner.rb

@@ -33,7 +33,7 @@ module Munge
       when :new, :changed
         @writer.write(abspath, content)
       when :double_write_error
-        raise "attempted to write #{item.route} twice"
+        raise Errors::DoubleWriteError, item.route
       when :identical
         # Defer to the reporter
       end

data/lib/munge/system/collection.rb

@@ -48,7 +48,7 @@ module Munge
       # @return [void]
       def push(item)
         if @items.key?(item.id)
-          raise "item with id `#{item.id}` already exists"
+          raise Errors::DuplicateItemError, item.id
         else
           @items[item.id] = item
         end
@@ -60,7 +60,7 @@ module Munge
         if @items.key?(id)
           @items[id]
         else
-          raise "item not found (#{id})"
+          raise Errors::ItemNotFoundError, id
         end
       end
 

data/lib/munge/system/processor.rb

@@ -19,7 +19,7 @@ module Munge
       # @param transformer [#call]
       def register_manually(name, transformer)
         if @registry.key?(name)
-          raise "already registered transformer `#{name}`"
+          raise Errors::DuplicateTransformerError, name
         else
           @registry[name] = transformer
         end
@@ -44,7 +44,7 @@ module Munge
         if @registry.key?(name)
           @registry[name]
         else
-          raise "transformer `#{name}` is not installed"
+          raise Errors::TransformerNotFoundError, name
         end
       end
     end

data/lib/munge/system/router.rb

@@ -13,7 +13,7 @@ module Munge
         when :filepath
           @registries[:filepath].push(router)
         else
-          raise "invalid router"
+          raise Errors::InvalidRouterError, router.type
         end
       end
 
@@ -32,7 +32,7 @@ module Munge
 
       def route_mapper(item, method_name, initial_route = nil)
         if !item.route && !initial_route
-          raise "item `#{item.relpath}` has no route"
+          raise Errors::ItemHasNoRouteError, item.relpath
         end
 
         itemish = Itemish.new(item, @processor)

data/lib/munge/util/config.rb

@@ -21,6 +21,8 @@ module Munge
 
         def read_yaml(abspath)
           YAML.load_file(abspath)
+        rescue
+          raise Munge::Errors::ConfigYmlNotFound, abspath
         end
       end
     end

data/lib/munge/version.rb

@@ -1,3 +1,3 @@
 module Munge
-  VERSION = "0.12.0".freeze
+  VERSION = "0.13.0".freeze
 end

data/lib/munge.rb

@@ -16,6 +16,7 @@ end
 # Core
 require "munge/version"
 require "munge/item"
+require "munge/errors"
 require "munge/util/path"
 require "munge/util/symbol_hash"
 require "munge/util/config"

data/seeds/setup.rb

@@ -1,3 +1,3 @@
-Dir.glob(File.join(config_path, "*.rb")).sort.each do |file_path|
+Dir.glob(File.join(lib_path, "*.rb")).sort.each do |file_path|
   import(file_path)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: munge
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Zach Ahn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-16 00:00:00.000000000 Z
+date: 2016-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -308,7 +308,7 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
-description: Documentation for this release is located in https://github.com/zachahn/munge/blob/v0.12.0/README.md
+description: Documentation for this release is located in https://github.com/zachahn/munge/blob/v0.13.0/README.md
 email:
 - zach.ahn@gmail.com
 executables:
@@ -330,6 +330,7 @@ files:
 - lib/munge/cli/commands/update.rb
 - lib/munge/cli/commands/view.rb
 - lib/munge/cli/dispatch.rb
+- lib/munge/errors.rb
 - lib/munge/formatters/default.rb
 - lib/munge/formatters/dots.rb
 - lib/munge/go/sass.rb
@@ -371,13 +372,13 @@ files:
 - seeds/.gitignore
 - seeds/Gemfile.tt
 - seeds/config.yml
-- seeds/config/_asset_roots.rb
-- seeds/config/routing.rb
-- seeds/config/sass.rb
-- seeds/config/view_helpers.rb
 - seeds/data.yml
 - seeds/layouts/default.html.erb
 - seeds/layouts/sitemap.html.erb
+- seeds/lib/_asset_roots.rb
+- seeds/lib/routing.rb
+- seeds/lib/sass.rb
+- seeds/lib/view_helpers.rb
 - seeds/rules.rb
 - seeds/setup.rb
 - seeds/src/about.html.erb