sumomo 0.6.4 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82038b259fd91406f002951849bd381049ab781f
-  data.tar.gz: 7ab6b857aab5696045677d6e46f28d39a2534b05
+  metadata.gz: af1b2093782a8048484a483a3df1f032ffe2e975
+  data.tar.gz: 554b97c4ed4fc116fc5923937433e0266e8db3d5
 SHA512:
-  metadata.gz: 97951e0b224355cc51028f4ddbc21f3d826aa9f3d9e5dd8b2b859f326f55597e743f5469cbb56b8332b3a99138dbe12028d2639f33609bfc5db6babbacc18420
-  data.tar.gz: 0c532926c529ae656dc2a65966ddaa23724caa930add7f2c485ffe7002cad0894358c6b74beea59eef3c94ba2c94e93d8169c1996e3c55f8a9e6a7732858638e
+  metadata.gz: ba55671ca59b064cfae0773e09d9093d23bb9fbb30959aeb565b47e790d1af763b3e519ed5ec548eb7f38c3321e4bee39d4d7caa162761cd681334f73a35e676
+  data.tar.gz: 8b95431d9b3e5438c5e5b81675abd319b5bac7d22bde8307ef6a74388ad2400cd523460699cd4e131862f23f1017c78d464d8b39f6dadd014dca8e2530ff2f4e

data/README.md

@@ -119,6 +119,12 @@ end
 output "APIURL", api
 ```
 
+You can test your API now
+
+```bash
+$ sumomo testapi -a TestGenAPI
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/data/sumomo/api_modules/node_modules/.bin/uuid

@@ -0,0 +1 @@
+data/sumomo/api_modules/node_modules/.bin/../uuid/bin/uuid

data/data/sumomo/api_modules/real_script.js

@@ -5,10 +5,81 @@ var os                  = require('os');
 var http                = require('http');
 var url                 = require('url');
 var merge               = require('utils-merge');
-var Router              = require('router')
+var Router              = require('router');
+var aws                 = require("aws-sdk");
 
 var router = Router();
 
+// S3 store
+function Storage()
+{
+    var s3 = new aws.S3({region: "{{ REGION }}"});
+
+    this.get = function(key, onComplete, onError)
+    {
+        s3.getObject({
+            Bucket: "{{ BUCKET }}",
+            Key: "data/{{ STORE_PREFIX }}/" + key
+        }, function(err, data) {
+            if (err)
+            {
+                if (onError)
+                {
+                    onError(err);
+                }
+            }
+            else 
+            {
+                if (onComplete)
+                {
+                    try
+                    {
+                        var val = JSON.parse(data.Body.toString());
+                        onComplete(val.value);
+                    }
+                    catch(e)
+                    {
+                        if (onError)
+                        {
+                          onError(e);
+                        }
+                    }
+                }
+            }
+        });
+    }
+
+    this.set = function(key, value, onComplete, onError)
+    {
+        var val = { value: value };
+
+        s3.putObject({
+            Bucket: "{{ BUCKET }}",
+            Key: "data/{{ STORE_PREFIX }}/" + key,
+            Body: JSON.stringify(val)
+        }, function(err, data) {
+            if (err)
+            {
+                if (onError)
+                {
+                    onError(err);
+                }
+            }
+            else 
+            {
+                if (onComplete)
+                {
+                    onComplete(key);
+                }
+            }
+        });
+    }
+
+    return this;
+}
+
+var Store = new Storage();
+
 function prepare(handler)
 {
     return function(request, callback)

data/data/sumomo/api_modules/test_script.js

@@ -8,6 +8,34 @@ var url          = require('url');
 var merge        = require('utils-merge');
 var Router       = require('router')
 
+// Simulated store
+function Storage()
+{
+	var store = {}
+
+	this.get = function(key, onComplete, onError)
+	{
+		if (store[key] === undefined)
+		{
+			onError({err: "no_such_key"});
+		}
+		else
+		{
+			onComplete(store[key]);
+		}
+	}
+
+	this.set = function(key, value, onComplete, onError)
+	{
+		store[key] = value;
+		onComplete(key);
+	}
+
+	return this;
+}
+
+var Store = new Storage();
+
 var router = Router();
 
 var response_sent = false;
@@ -143,4 +171,5 @@ function prepare(handler)
 
 // {{ ROUTES }}
 
-server.listen(3000)
+console.log("Listening on port 5000")
+server.listen(5000)

data/lib/sumomo.rb

@@ -212,12 +212,13 @@ module Sumomo
 			puts "Testing API #{test_name}"
 			apigen = Stack::APIGenerator.new(pretty_print: pretty_print, &tester.apis[test_name])
 
-			script = File.read(File.join(Gem.datadir("sumomo"), "api_modules", "test_script.js"))
+		
+			script = File.read(File.join(Gem.loaded_specs['sumomo'].full_gem_path, "data", "sumomo", "api_modules", "test_script.js"))
         	script.sub!("// {{ ROUTES }}", apigen.generate);
 
 			File.write(".test.js", script)
 
-			exec "NODE_PATH=#{File.join(Gem.datadir("sumomo"), "api_modules", "node_modules")} node .test.js"
+			exec "NODE_PATH=#{File.join(Gem.loaded_specs['sumomo'].full_gem_path, "data", "sumomo", "api_modules", "node_modules")} node .test.js"
 		end
 	end
 

data/lib/sumomo/api.rb

@@ -78,12 +78,16 @@ module Sumomo
             Name name
         end
 
-        script ||= File.read(File.join(Gem.datadir("sumomo"), "api_modules", "real_script.js"))
+        script ||= File.read(File.join(Gem.loaded_specs['sumomo'].full_gem_path, "data", "sumomo", "api_modules", "real_script.js"))
 
         apigen = APIGenerator.new(&block);
         script.sub!("// {{ ROUTES }}", apigen.generate);
 
-        module_dir = File.join(Gem.datadir("sumomo"), "api_modules")
+        script.gsub!("{{ REGION }}", @region);
+        script.gsub!("{{ BUCKET }}", @bucket_name);
+        script.gsub!("{{ STORE_PREFIX }}", "functions/" + name);
+
+        module_dir = File.join(Gem.loaded_specs['sumomo'].full_gem_path, "data", "sumomo", "api_modules")
 
         files = Dir[File.join(module_dir, "**/*")].select{|x| File.file?(x)}.map do |x| 
             { name: x.sub(/^#{module_dir}\//, ""), code: File.read(x) } 

data/lib/sumomo/ec2.rb

@@ -494,8 +494,8 @@ aws ec2 associate-address --region `cat /etc/aws_region` --instance-id `curl htt
 				end
 
 				if spot_price and ec2_sns_arn
-					watcher = File.read( File.join( Gem.datadir("sumomo"), "sources", "spot-watcher.sh" ) )
-					poller = File.read( File.join( Gem.datadir("sumomo"), "sources", "spot-watcher-poller.sh" ) )
+					watcher = File.read( File.join( Gem.loaded_specs['sumomo'].full_gem_path, "data", "sumomo", "sources", "spot-watcher.sh" ) )
+					poller = File.read( File.join( Gem.loaded_specs['sumomo'].full_gem_path, "data", "sumomo", "sources", "spot-watcher-poller.sh" ) )
 
 					file "/etc/init.d/spot-watcher", content: watcher, mode: "000700"
 					file "/bin/spot-watcher", content: poller, mode: "000700", context: {

data/lib/sumomo/stack.rb

@@ -75,7 +75,7 @@ module Sumomo
 				files:[
 					{
 						name: "index.js", 
-						code: File.read( File.join(Gem.datadir("sumomo"), "custom_resource_utils.js") ).sub("{{ CODE }}", code)
+						code: File.read( File.join(Gem.loaded_specs['sumomo'].full_gem_path, "data", "sumomo", "custom_resource_utils.js") ).sub("{{ CODE }}", code)
 					}
 				],
 				description: "CF Resource Custom::#{name}",
@@ -99,7 +99,7 @@ module Sumomo
 			if match
 				if !@custom_resources[type]
 
-					resource_function_source = File.join(Gem.datadir("sumomo"), "custom_resources", "#{match[:name]}.js")
+					resource_function_source = File.join(Gem.loaded_specs['sumomo'].full_gem_path, "data", "sumomo", "custom_resources", "#{match[:name]}.js")
 					
 					if File.exists? resource_function_source
 						define_custom_resource(name: match[:name], code: File.read(resource_function_source))

data/lib/sumomo/version.rb

@@ -1,3 +1,3 @@
 module Sumomo
-  VERSION = "0.6.4"
+  VERSION = "0.7.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sumomo
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.7.1
 platform: ruby
 authors:
 - David Siaw
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-13 00:00:00.000000000 Z
+date: 2017-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -2558,7 +2558,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: An advanced infrastructure description language for AWS

data/data/sumomo/api_modules/node_modules/.bin/uuid

@@ -1,26 +0,0 @@
-#!/usr/bin/env node
-
-var path = require('path');
-var uuid = require(path.join(__dirname, '..'));
-
-var arg = process.argv[2];
-
-if ('--help' === arg) {
-  console.log('\n  USAGE: uuid [version] [options]\n\n');
-  console.log('  options:\n');
-  console.log('  --help                     Display this message and exit\n');
-  process.exit(0);
-}
-
-if (null == arg) {
-  console.log(uuid());
-  process.exit(0);
-}
-
-if ('v1' !== arg && 'v4' !== arg) {
-  console.error('Version must be RFC4122 version 1 or version 4, denoted as "v1" or "v4"');
-  process.exit(1);
-}
-
-console.log(uuid[arg]());
-process.exit(0);