fig2coreos 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 884412e8eca038c81d5834eacea5ea641290d30d
-  data.tar.gz: 6b2d8839f718e9827343290acd61683c8037812f
+  metadata.gz: 944247b3ed3f3f5e0dd8792cdb5e3f944b610dd9
+  data.tar.gz: dff72cbe3a9ced91a1e81d5c4f8dd8afad59afb9
 SHA512:
-  metadata.gz: a483f79d273b744a4d880933c5e0d4fb8fd3167165e14f8b402a59a8ee364951765a38abeb53292f7a1a1448ad901ffc36b9f5b81810939966f9ce257a412d30
-  data.tar.gz: 586350f3c608138d5fa4abe763f8d0abf9d490c27ae3ea30f22e49e89ab33e50c944dec55e1c80ebbcdd49189ca141fe36e1281ae3eb868aff37a4e3d9c59338
+  metadata.gz: b510c97c08d9b97fc925df10b1e31d64d3f39100ae7e98170fbd9fd21cfb8108c4f73c351a7e9917825b80e7060882796b775a85dc4c192ac1c5d930c71ea350
+  data.tar.gz: bd08a816eac64b32db8fb087dc7b9921dc4f74985a90801ef6c16c2f9fccd59bcb9e294a38fc075556d9e76039767c95005625d1c12ab7a7c81c1009bb6f2aba

data/bin/fig2coreos

@@ -4,15 +4,21 @@ require File.expand_path(File.join(File.dirname(__FILE__), "..", "lib", "fig2cor
 
 FIG2COREOS_BANNER = "Usage: fig2coreos [options] APP_NAME FIG_YAML OUTPUT_DIRECTORY"
 
-options = {type: "vagrant"}
+options = {type: "fleet"}
+
 OptionParser.new do |opts|
   opts.banner = FIG2COREOS_BANNER
 
-  opts.on("-t", "--type TYPE", "Output type: vagrant (default), systemd (just the systemd service files)") do |type|
+  opts.on("-t", "--type TYPE", "Output type: fllet (default) or vagrant (generate a Vagrantfile)") do |type|
     options[:type] = type
   end
 end.parse!
 
+if ARGV[0].to_s.include?("-t")
+	ARGV.shift
+	ARGV.shift
+end
+
 if ARGV[0].nil?
 	puts "[ERROR] APP_NAME required"
 	puts FIG2COREOS_BANNER
@@ -33,9 +39,7 @@ if !ARGV[2] || !File.directory?(File.expand_path(ARGV[2].to_s))
 	end
 end
 
-vagrant_version = `vagrant --version`.split.last
-
-if options[:type] == "vagrant" && Gem::Version.new(vagrant_version) < Gem::Version.new("1.4.3")
+if options[:type] == "vagrant" && Gem::Version.new(`vagrant --version`.split.last) < Gem::Version.new("1.4.3")
 	puts "[ERROR] Your version of vagrant (#{vagrant_version}) is out of date, please upgrade to at least 1.4.3 at http://www.vagrantup.com/downloads.html or change the --type"
 	exit -1
 end

data/lib/fig2coreos.rb

@@ -1,3 +1,6 @@
+require 'rubygems'
+require 'bundler/setup' 
+
 require 'yaml'
 require 'fileutils'
 
@@ -10,17 +13,20 @@ class Fig2CoreOS
     @app_name = app_name
     @fig = YAML.load_file(fig_file.to_s)
     @output_dir = File.expand_path(output_dir.to_s)
+    @vagrant = (options[:type] == "vagrant")
 
     # clean and setup directory structure
+    FileUtils.rm_rf(Dir[File.join(@output_dir, "*.service")])
     FileUtils.rm_rf(File.join(@output_dir, "media"))
     FileUtils.rm_rf(File.join(@output_dir, "setup-coreos.sh"))
     FileUtils.rm_rf(File.join(@output_dir, "Vagrantfile"))
-    FileUtils.mkdir_p(File.join(@output_dir, "media", "state", "units"))
-
+    
+    if @vagrant
+        FileUtils.mkdir_p(File.join(@output_dir, "media", "state", "units"))
+        create_vagrant_file
+    end
+    
     create_service_files
-
-    create_vagrant_file if options[:type] == "vagrant"
-
     exit 0
   end
 
@@ -40,7 +46,13 @@ class Fig2CoreOS
         "docker"
       end
 
-  		File.open(File.join(@output_dir, "media", "state", "units", "#{service_name}.1.service"), "w") do |file|
+      if @vagrant
+        base_path = File.join(@output_dir, "media", "state", "units")
+      else
+        base_path = @output_dir
+      end
+
+  		File.open(File.join(base_path, "#{service_name}.1.service") , "w") do |file|
         file << <<-eof
 [Unit]
 Description=Run #{service_name}_1
@@ -61,7 +73,7 @@ WantedBy=local.target
 eof
   		end
 
-      File.open(File.join(@output_dir, "media", "state", "units", "#{service_name}-discovery.1.service"), "w") do |file|
+      File.open(File.join(base_path, "#{service_name}-discovery.1.service"), "w") do |file|
         file << <<-eof
 [Unit]
 Description=Announce #{service_name}_1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fig2coreos
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Lucas Carlson