gotta-mod 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dffbe2fab15b0bc117d98110717732176d932ada50899df7a733b3245d56e3eb
-  data.tar.gz: 7c89416f876084ed357beeef168141caf75d350a274b0f50d5af031b844d369d
+  metadata.gz: cddb21ae617ea4908ec5074b0f284a65a92847d2c973c47f4cac7d1e42671994
+  data.tar.gz: d01212517c946a46de68764f60baa90636bdb050ffe36b03c396bcba0e879b56
 SHA512:
-  metadata.gz: 8901b3e156889aeabb0a0edde0cc43716efb835dac67897bf0f5bd4dd50624d954dbdde628ef9f8bd02d4d373cfbb2f854dafa9e2a00864e339c7c2cd5d7f0ef
-  data.tar.gz: 1736f17e8d5357f25ce2d4fcbb6cc9f6231f57c426a453c4a707c19e9fbf2816c069c8c4bce7d975cbf7ab1c2bdc39e7c4a490c7616a1da157ea7fcb9c51c2e5
+  metadata.gz: 72c57e501a57bb5a9690ab03e518c9fe7b29f3b4300810f77058a9e2a77a5b87bada1c8bfc1eeb11d752b9d7726ca65266af20600574fb773c018e0a7b71b52b
+  data.tar.gz: b95c7bb86fa24111b2331c26f60d17ad569474b7167ed240f089cb204ebc892591e983e0d6e1d13be73677ad16747909b9a3fbffc768a61c1877d004517d73db

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gotta-mod (0.1.1)
+    gotta-mod (0.1.2)
       listen (~> 3.1)
 
 GEM

data/README.md

@@ -3,8 +3,3 @@
 Description will follow
 
 # Developing
-
-* Clone the repo.
-* Run `./dev-setup.sh`
-* Create a gotta project: `gotta new project test-proj`
-* Cd into the project folder and run `gotta mod`

data/lib/gotta/mod.rb

@@ -7,14 +7,14 @@ require "gotta/mod/project"
 require "gotta/mod/event"
 require "gotta/mod/listener"
 require "gotta/mod/hub"
-require "gotta/mod/mod"
-
+require "gotta/mod/mod_builder"
+require 'pry'
 module Gotta
   module Mod
     class Error < StandardError; end
 
-    def self.hub=(hub)
-      @@hub = hub
+    def self.hub=(hub_instance)
+      @@hub = hub_instance
     end
 
     def self.hub
@@ -23,18 +23,18 @@ module Gotta
 
     def self.now(dir: Dir.pwd)
       project = Gotta::Project.new(dir)
-      Gotta::Project.config = project.config
+      Gotta::Project.config = project
       listener = Listener.new(working_directory: dir)
       self.hub = Hub.new(listener.queue)
       hub_thread = Thread.new {hub.start} # Hub runs on a separate thread.
-
       # Now require all `main.rb` files inside the mods folder
-      Dir.glob("#{project.config["mods_dir"]}/*") do |f|
+      Dir.glob("#{project.mods_dir}/*") do |f|
         rbfile = "#{f}/#{File.basename(f)}.rb"
-        Mod.class_eval(File.read(rbfile), rbfile)
+        ModBuilder.class_eval(File.read(rbfile), rbfile)
       end
+      hub.check_dependencies
       listener.start
-      puts "Gotta start using it now."
+      puts "Ready for action."
       sleep
     end
   end

data/lib/gotta/mod/cli/commands.rb

@@ -1 +1 @@
-require_relative "new"
+Dir.glob("#{__dir__}/*.rb").each {|f| require f}

data/lib/gotta/mod/cli/watch.rb

@@ -0,0 +1,20 @@
+module Gotta
+  module Mod
+    module CLI
+      class Watch
+
+        attr_reader :options
+        def initialize(options)
+          @options = options
+        end
+
+        def run!
+          puts "Watch Received options #{@options}"
+          ::Gotta::Mod.now
+        end
+      end
+
+      ::Gotta::CLI::Command.register("watch", ::Gotta::Mod::CLI::Watch)
+    end
+  end
+end

data/lib/gotta/mod/hub.rb

@@ -4,6 +4,13 @@ module Gotta
   module Mod
     require "set"
 
+    class MissingDependencyError < StandardError
+      def initialize(source, dep)
+        msg = "The mod '#{source}' depends on '#{dep}', but '#{dep}' is not installed in this project. Installed mods: #{Mod.hub.loaded_mods.to_a}"
+        super msg
+      end
+    end
+
     # Starts a new thread and goes on a blocking
     # operation to constantly pop values from the
     # event queue.
@@ -13,7 +20,7 @@ module Gotta
     # The execution of the mod code is done asynchronously
     # on a separate thread.
     class Hub
-      attr_reader :queue, :mods
+      attr_reader :queue, :mods, :loaded_mods
       def initialize(queue)
         # This is the separator to generate the key
         # for the mods hash.
@@ -21,6 +28,7 @@ module Gotta
         @queue = queue
         @mutex = Mutex.new
         @mods = {}
+        @loaded_mods = Set.new
         @paths = Set.new
         @threads = Set.new
       end
@@ -51,6 +59,19 @@ module Gotta
         }
       end
 
+      def add_dependency(dep)
+        @dependencies ||= Set.new
+        @dependencies << dep
+      end
+
+      def check_dependencies
+        @dependencies.each do |deps|
+          source, dep = deps.to_a[0]
+          next if @loaded_mods.include?(dep)
+          raise MissingDependencyError.new(source, dep)
+        end
+      end
+
       private
       # Execute the mod code in a separate thread
       def run_mods(event, keys)

data/lib/gotta/mod/{mod.rb → mod_builder.rb}

@@ -2,9 +2,9 @@
 
 module Gotta
   module Mod
-    class Mod
+    class ModBuilder
 
-      def build(name, &block)
+      def self.mod(name, &block)
         new(name: name, &block)
       end
 
@@ -15,7 +15,7 @@ module Gotta
       def initialize(name:, &block)
         @name = name
         instance_eval(&block)
-        @hub = Mod.hub
+        Mod.hub.loaded_mods << name
         puts "Mod '#{name}' registered."
       end
 
@@ -27,12 +27,12 @@ module Gotta
         @description = desc
       end
 
-      def project
-        Gotta::Project.config
+      def depends_on(mod_name)
+        Mod.hub.add_dependency({self.name => mod_name})
       end
 
       def on(type, &block)
-        @hub.register_mod(
+        Mod.hub.register_mod(
           mod_name: name,
           path: @filter,
           on: type,

data/lib/gotta/mod/project.rb

@@ -2,7 +2,8 @@
 
 module Gotta
   require "yaml"
-  class Project
+  require "ostruct"
+  class Project < OpenStruct
     class << self
       attr_accessor :config
     end
@@ -12,16 +13,17 @@ module Gotta
       @dir = dir
       @config_file_path = "#{dir}/project.yml"
       @config = read_config
-      @config["mods_dir"] ||= "mods"
-      @config["functions_dir"] ||= "functions"
-      @config["public_dir"] ||= "public"
+      @config["project"]["mods_dir"] ||= "mods"
+      @config["project"]["components_dir"] ||= @config["project"]["functions_dir"] || "components"
+      @config["project"]["public_dir"] ||= "public"
       check_mods_dir
+      super(@config['project'])
     end
 
     private
 
     def check_mods_dir
-      Dir.mkdir(@config["mods_dir"]) unless File.directory?(@config["mods_dir"])
+      Dir.mkdir(@config["project"]["mods_dir"]) unless File.directory?(@config["project"]["mods_dir"])
     end
 
     def read_config #=> {}

data/lib/gotta/mod/version.rb

@@ -2,6 +2,6 @@
 
 module Gotta
   module Mod
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gotta-mod
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Paulo Arruda
@@ -88,10 +88,11 @@ files:
 - lib/gotta/mod.rb
 - lib/gotta/mod/cli/commands.rb
 - lib/gotta/mod/cli/new.rb
+- lib/gotta/mod/cli/watch.rb
 - lib/gotta/mod/event.rb
 - lib/gotta/mod/hub.rb
 - lib/gotta/mod/listener.rb
-- lib/gotta/mod/mod.rb
+- lib/gotta/mod/mod_builder.rb
 - lib/gotta/mod/monkey_patch.rb
 - lib/gotta/mod/project.rb
 - lib/gotta/mod/version.rb