sumomo 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 081f53d1cf887c37ccd6634d470674276a600694
-  data.tar.gz: d7b8b5d4e40b8b0a283af3dc6dd898a937ee14d8
+  metadata.gz: 19a7b13c51abbddeff61c5b0b23eb1163dd70bd8
+  data.tar.gz: fbe8f61d32f2d6acd41b6437fa8f8ac84773f4c3
 SHA512:
-  metadata.gz: 401a6213e3e06dab6ca9e27481bec2f914cf3643f6f0b38d1a817f566104f897cfa174135f8fcfd284901788e51862c67ffbc1bf5db51c192f6132f8a183d625
-  data.tar.gz: 0a3e46d8623b2e536bdde1451b1d8db85b735aa90c554073e339e327f8bc425a70f573db980c167172f6c6f60601976673c55db4ca3d4d814a8a8c907a23b074
+  metadata.gz: a12275c78d5ee20bcd911f678607003f6c1681570243d1a8772d702dc1950b8180474cfdfbd10440813d05d8d370b260c6c235c476d15de96c16dbf1dc225b2e
+  data.tar.gz: a13a1e7840147f9e70948256b81ecd8f0baf25b7bc58bc53e938e641663a8040e5ca00d949dae36de3333a0f3fc54b99da0c592bb95f33323a03d78940194265

data/README.md

@@ -1,5 +1,7 @@
 # Sumomo
 
+Making cloudformation suck less.
+
 Because plums are also peaches
 
 ## Installation
@@ -18,22 +20,55 @@ Or install it yourself as:
 
     $ gem install sumomo
 
-## Usage
+## Commandline Tool Usage
 
 This gem lets you use all of the syntax in the [momo](https://github.com/davidsiaw/momo) and more!
 
 You need to setup your AWS credentials using `aws configure`.
 
+This is the simplest way to use sumomo:
+
+First, create a file called Sumomofile in your directory
+
+```ruby
+# Sumomofile
+x = hidden_value "meow"
+eip = make "AWS::EC2::EIP"
+output "IPAddress", eip
+output "Haha", x
 ```
+
+To create a stack that acquires an IP Address and outputs it
+
+	$ sumomo create mystack
+
+To view a stack's outputs
+
+	$ sumomo outputs mystack
+
+To update a stack
+
+	$ sumomo update mystack
+
+To delete a stack
+
+	$ sumomo delete mystack
+
+## Library Usage
+
+The commandline tool actions can also be performed programmatically
+
+```ruby
 require "sumomo"
 
 Sumomo::update_stack(name: "mystack", region: "ap-northeast-1") do
 	x = hidden_value "meow"
-
+	eip = make "AWS::EC2::EIP"
+	output "IPAddress", eip
 	output "Haha", x
 end
 
-Sumomo::wait_for_stack(name: "kurosawa", region: "ap-northeast-1")
+Sumomo::wait_for_stack(name: "mystack", region: "ap-northeast-1")
 ```
 
 ## Development

data/exe/sumomo

@@ -25,10 +25,11 @@ when "delete"
 
 when "create", "update"
 	local_opts = Trollop::options do
-		opt :filename, "File that describes the stack", type: :string, required: true
+		opt :filename, "File that describes the stack", type: :string, default: "Sumomofile"
 	end
 	Sumomo::create_stack(name: ARGV[0], region: global_opts[:region]) do
-		eval File.read(local_opts[:filename]), local_opts[:filename]
+		proc = Proc.new {}
+		eval File.read(local_opts[:filename]), proc.binding, local_opts[:filename]
 	end
 
 when "outputs"

data/lib/sumomo/ecs.rb

@@ -44,30 +44,52 @@ module Sumomo
 						}
 					}
 
-					definition["MountPoints"] = container[:files].map do |file, destination|
+					if container[:files]
+						definition["MountPoints"] = container[:files].map do |file, destination|
 
-						s3_location = "container_files/#{sluggify(service_name)}/#{definition["Name"]}/#{file}"
-						volume_name = sluggify("#{definition["Name"].underscore}_#{destination}").camelize
+							s3_location = "container_files/#{sluggify(service_name)}/#{definition["Name"]}/#{file}"
+							volume_name = sluggify("#{definition["Name"].underscore}_#{destination}").camelize
 
-						upload_file s3_location, File.read(file)
+							upload_file s3_location, File.read(file)
 
-						machine_volume_locations[s3_location] = "/opt/s3/#{s3_location}"
+							machine_volume_locations[s3_location] = "/opt/s3/#{s3_location}"
 
-						volumes << {
-							"Name" => volume_name,
-							"Host" => { "SourcePath" => machine_volume_locations[s3_location] }
-						}
+							volumes << {
+								"Name" => volume_name,
+								"Host" => { "SourcePath" => machine_volume_locations[s3_location] }
+							}
 
-						{
-							"ContainerPath" => destination,
-							"SourceVolume" => volume_name
-						}
+							{
+								"ContainerPath" => destination,
+								"SourceVolume" => volume_name
+							}
+						end
+						container.delete(:files)
 					end
 
-					container.each do |key, value|
-						if key != :files
-							definition["#{key}".camelize] = value
+					if container[:ports]
+						definition["PortMappings"] = container[:ports].map do |from_port, to_port|
+							{
+								"ContainerPort" => from_port,
+								"HostPort" => to_port
+							}
 						end
+						container.delete(:ports)
+					end
+
+					if container[:envvars]
+						definition["Environment"] = container[:envvars].map do |var_name, var_value|
+							{
+								"Name" => var_name,
+								"Value" => var_value
+							}
+						end
+						container.delete(:envvars)
+					end
+
+
+					container.each do |key, value|
+						definition["#{key}".camelize] = value
 					end
 
 					definition

data/lib/sumomo/version.rb

@@ -1,3 +1,3 @@
 module Sumomo
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sumomo
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - David Siaw
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-17 00:00:00.000000000 Z
+date: 2017-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler