modables_dsl 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d67000220f3da24d94fc9cbcc9b5f14425889a3e
-  data.tar.gz: 802610e8538ed73ca3f68c119c73e5aa03675f62
+  metadata.gz: c8389a2bcc2c1e7ce17100ba4ac0f70d8b163255
+  data.tar.gz: dadfcf9c8e3a8173ee21f47698d9347b59b2e7fc
 SHA512:
-  metadata.gz: 5519b59da421099d59b9af39e58d1c71c66ee409deee7c315ac6a9a071d78bc3e927c003c2c3ad5c07a9138edb3f5eafbf4f9b10a5d19358ff628dc9e0012b86
-  data.tar.gz: 29524d2c10ceba5f7fc6e961d8584def67f3d2ddd9ee193f7dd1085c9aeabff9fde337822cb898a1d5dd54053a7696fc42ed1b024484457c7bcc7fc5e5259912
+  metadata.gz: 948efd2084ce5f75044db45c2e120b1ccb8566a6cad41879093c1c8fcf3bc7d503250fca0258aacc7906e7df12b218b315d022e0f89201448abfa01c7759d0e9
+  data.tar.gz: c713d72d8da299c3182810e0e87a74dde7ddc7c5bfc44a85773729313db0fe56c642d305818116676a509ac162da11b6ee265afa54ffb9b0c010cff70255ed01

data/lib/modables_dsl.rb

@@ -1,5 +1,6 @@
 require 'active_support/json'
 require 'active_support/core_ext/hash/deep_merge'
+require 'active_support/core_ext/string/inflections'
 require 'logger'
 require 'optparse'
 require 'yaml'
@@ -10,3 +11,4 @@ require 'modables_dsl/dsl/arguments'
 require 'modables_dsl/dsl/core'
 require 'modables_dsl/generate'
 require 'modables_dsl/message'
+require 'modables_dsl/version'

data/lib/modables_dsl/cli.rb

@@ -2,21 +2,32 @@ module ModablesDSL
   module Cli
 
     def self.parse
-      OptionParser.new do|args|
+      option_parser = OptionParser.new do|args|
         args.banner = "Usage: modables-dsl [options]"
-        args.on('-c', '--config config', 'YAML config file') do |config|
+        args.on('-c', '--config file.yaml', 'YAML config file') do |config|
           self.opts['config'] = config
         end
 
-        args.on('-d', '--dir', 'Use directory list from config') do |dir|
-          self.opts['dir'] = dir
+        args.on('-f', '--file-ext tf.json', 'JSON output file extension') do |file_ext|
+          self.opts['file-ext'] = file_ext
+        end
+
+        args.on('-v', '--version', 'DSL version') do |version|
+          puts ModablesDSL::VERSION
+          exit 0
         end
 
         args.on('-h', '--help', 'Show this message') do
           puts args
           exit 0
         end
-      end.parse!
+      end
+
+      begin
+        option_parser.parse!
+      rescue OptionParser::MissingArgument => e
+        ModablesDSL::Message.error "#{e.message}"
+      end
 
       ModablesDSL::Generate.files
     end

data/lib/modables_dsl/config.rb

@@ -3,13 +3,26 @@ module ModablesDSL
 
     def self.get
       if @config.nil?
+
+        @config = {
+          'dsl' => {
+            'file_ext'   => 'moda.json',
+            'stack_dirs' => Array.new,
+          }
+        }
+
         config_file = ModablesDSL::Cli.opts['config'] || "#{ENV['HOME']}/.modables.yaml"
 
-        unless File.file? config_file
-          ModablesDSL::Message.error "Config file does not exist. (#{config_file})"
-        end
+        # try to read from config file
+        if File.file? config_file
+          ModablesDSL::Message.log.info "Loading config #{config_file}"
+          @config.deep_merge!(YAML.load_file(config_file))
 
-        @config = YAML.load_file(config_file)
+        # if config file arg is passed but file is missing
+        elsif ModablesDSL::Cli.opts['config']
+          ModablesDSL::Message.error "Config file #{config_file} not found"
+          exit 1
+        end
       end
 
       @config

data/lib/modables_dsl/dsl/arguments.rb

@@ -9,6 +9,9 @@ module ModablesDSL
 
       def property meth, *args, &block
 
+        # If requested convert underscrores to dashes.
+        meth = ActiveSupport::Inflector.dasherize(meth.to_s) if args.include? :dash
+
         # If a block is passed it means we are building a hash.
         if block
 
@@ -33,11 +36,7 @@ module ModablesDSL
 
         # Else its a String, Integer, Boolean or Array.
         else
-          if args.include? :json
-            @args_h[meth] = ActiveSupport::JSON.encode(args.last)
-          else
-            @args_h[meth] = args.last
-          end
+          @args_h[meth] = args.last
         end
 
       end

data/lib/modables_dsl/dsl/core.rb

@@ -26,7 +26,7 @@ module ModablesDSL
       ActiveSupport::JSON.encode(@data)
     end
 
-    def self.gen
+    def self.moda
       yield
       self.encode_json
     end

data/lib/modables_dsl/generate.rb

@@ -2,17 +2,17 @@ module ModablesDSL
   module Generate
 
     def self.files
-      self.stack_files.each do |mod_file|
+      self.stack_files.each do |moda_file|
 
-        file_prefix = mod_file.rpartition('.mod').first
-        file_suffix = ModablesDSL::Config.get['dsl']['destination_file_suffix'] || 'mod.json'
+        file_prefix = moda_file.rpartition('.moda').first
+        file_suffix = ModablesDSL::Cli.opts['file-ext'] || ModablesDSL::Config.get['dsl']['file_ext']
 
         destination_file = "#{file_prefix}.#{file_suffix}"
 
-        ModablesDSL::Message.log.info "Reading from #{mod_file}"
+        ModablesDSL::Message.log.info "Reading from #{moda_file}"
 
         File.open(destination_file, 'w') do |new_file|
-          new_file.write ModablesDSL::DSL.instance_eval IO.read mod_file
+          new_file.write ModablesDSL::DSL.instance_eval IO.read moda_file
         end
         
         ModablesDSL::Message.log.info "Wrote to #{destination_file}"
@@ -21,19 +21,23 @@ module ModablesDSL
 
     def self.stack_files
 
-      dirs = if ModablesDSL::Cli.opts['dir']
-        ModablesDSL::Config.get['dsl']['stack_dirs']
-      else
-        [Dir.pwd]
+      moda_files = Array.new
+      stack_dirs = ModablesDSL::Config.get['dsl']['stack_dirs'] << Dir.pwd
+
+      stack_dirs.each do |dir|
+        moda_files += Dir.glob("#{dir}/**/*.moda")
       end
 
-      mod_files = Array.new
+      total_moda_files = moda_files.size
 
-      dirs.each do |dir|
-        mod_files += Dir.glob("#{dir}/**/*.mod.rb")
+      if total_moda_files == 0
+        ModablesDSL::Message.log.info '0 moda files found.'
+        exit 0
+      else
+        ModablesDSL::Message.log.info "#{total_moda_files} moda #{"file".pluralize(total_moda_files)} found"
       end
 
-      mod_files
+      moda_files
     end
 
   end

data/lib/modables_dsl/version.rb

@@ -1,3 +1,3 @@
 module ModablesDSL
-  VERSION = "0.1.0"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: modables_dsl
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Modables
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-16 00:00:00.000000000 Z
+date: 2017-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport