marfa 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47f3270a50621c8708d3977e3773b2ac5aa03516
-  data.tar.gz: 6a7512f056c10e4c2aabe283425dbf0756b72eeb
+  metadata.gz: a423c48b5405907fa9a6e7e782f8695dad2c3c36
+  data.tar.gz: 9a4ab9f1754e2bdab22f437a5928ef00f94b8fa3
 SHA512:
-  metadata.gz: 8ec251c505738406677f431605eeb06a341d533fc7a2cec9567ee990f6c3948840392cbedd2c866ad237a90f8e35bab26519444da514b4571f2b9a64b27b35e8
-  data.tar.gz: 0219d83d38ebe1ce727dc73d42d5c1dcae9ddaf55685bad8f6af89e74a84dc4d2c8c071393a2224040e569b79acb836189e5aa0a039b1786f47e489b7ae09d01
+  metadata.gz: 138fe6e3b19da6060c509eaebd92b7c7a13c6a0f39ca8a435958e9cc9faa5c6c714c9be89c28d4815e45b7ccbf0dc1939a5d97691a7f42f9d0ddc0e1c82352ff
+  data.tar.gz: 400b292c45fdfa2bf8218147282bc1a15dee62f1c9ea1456c229dd9f8e2e5dfcb4c0d8ae7e8ab6961d4be14dff45b10a472356c4996fb386fa878671cbd8411c

data/bin/marfa-build-js

@@ -8,21 +8,31 @@ include FileUtils
 
 options = {
   home_path: FileUtils.pwd,
-  search_dir: '',
-  output_dir: '/static/js'
+  search_dir: '/app',
+  output_dir: '/static/js',
+  hierarchy: false,
+  minify: false
 }
 
 parser = OptionParser.new do |opts|
   opts.banner = 'Usage: marfa-build-js [options]'
 
-  opts.on('-s', '--search_dir search_dir', 'Search dir') do |search_dir|
+  opts.on('-s', '--search-dir SEARCH_DIR', 'Search dir') do |search_dir|
     options[:search_dir] = search_dir
   end
 
-  opts.on('-o', '--output_dir output_dir', 'Output dir') do |output_dir|
+  opts.on('-o', '--output-dir OUTPUT_DIR', 'Output dir') do |output_dir|
     options[:output_dir] = output_dir
   end
 
+  opts.on('-u', '--use_hierarchy', 'Use current dir hierarchy') do
+    options[:hierarchy] = true
+  end
+
+  opts.on('-m', '--minify', 'Minify js') do
+    options[:minify] = true
+  end
+
   opts.on('-h', '--help', 'Displays help') do
     puts opts
     exit
@@ -46,12 +56,14 @@ Dir[search_dir + '/**/*.js'].each do |path|
   )
 
   result = Babel::Transpiler.transform(File.read(path))
-  code = closure.compile(result['code'])
+  code = (options[:minify]) ? closure.compile(result['code']) : result['code']
+  file_name = path.split('/').last
   output_path = options[:home_path] + options[:output_dir]
+  output_path += path.sub(search_dir, '').sub(file_name, '') if options[:hierarchy]
 
   mkdir_p(output_path) unless Dir.exist?(output_path)
 
-  File.open(output_path + '/' + path.split('/').last, 'w') do |f|
+  File.open(output_path + '/' + file_name, 'w') do |f|
     f.puts code
   end
 end

data/lib/marfa/version.rb

@@ -1,7 +1,7 @@
 # Version constant
 module Marfa
   # The version constant for the current version of Marfa
-  VERSION = '0.1.4' unless defined?(Marfa::VERSION)
+  VERSION = '0.1.5' unless defined?(Marfa::VERSION)
 
   # The current Marfa version.
   # @return [String] The version number

data/marfa.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'marfa'
-  s.version     = '0.1.4'
+  s.version     = '0.1.5'
   s.platform    = Gem::Platform::RUBY
   s.date        = Time.now.strftime('%Y-%m-%d')
   s.summary     = 'Little Sinatra-based framework'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marfa
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Max Krechetov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-06 00:00:00.000000000 Z
+date: 2017-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml