service_contract-generator 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4332265d8952d7ebb35e44a3dad5d148d7de7410
-  data.tar.gz: 7ac0bc89a60c4323db6fc867279990f909bcce56
+  metadata.gz: 2140ab1d446df2a7a91e633c4a8dc3d9eea06f80
+  data.tar.gz: b6ec2abd59d37878109217fe1a75898858913462
 SHA512:
-  metadata.gz: d9227711cf96d8460bf7480de456d244e69c54417fc49c16d97413757b1a04d71baa13739a602e2a42534617fcc5f93d6f8ad2f9288cd7615dd6da24fcbe7db0
-  data.tar.gz: 08c7615d430ae3875d67415d023ff5e6d1fdfef7e1448503d4a0976dcbdf13f38144233dda063de4fc7d1b24ffc0d5fbd431db0a35a5866d4c609821b96c9fb4
+  metadata.gz: c451cb4a8428cc7a95a4c41620bcdfe5899a910a63d60faa0d06782aeac6796f944a4848c90751e344b7380055dae16e3ad3cd4c9ee173e4b5e082c9ea8567a7
+  data.tar.gz: 2a268a1139c712ebc2357fdba23b02bbefcb5503af27cbd6da9f9ebba34ee74a5901bc79d17de7384065d05114dc4e73b6cfab66f9690f14463c4fb286f51798

data/lib/service_contract/generator/cli.rb

@@ -12,16 +12,14 @@ module ServiceContract
         FileUtils.mkdir_p(folder)
         output_file = File.join(folder, "#{ActiveSupport::Inflector.underscore(protocol_name)}.avdl")
         b = binding()
-        erb = ERB.new(File.read(File.expand_path("../../../../template/protocol.avdl.erb", __FILE__)))
-        File.open(output_file, 'w') do |file|
-          file.write(erb.result(b))
-        end
+        write_template("protocol.avdl.erb", output_file, b)
       end
 
       desc "gem CONTRACT_NAME", "bootstraps a new service_contract"
       def gem(contract_name)
         path = contract_name.gsub("-", "/")
         module_name = ActiveSupport::Inflector.camelize(path)
+        module_names = module_name.split("::")
 
         # create directory structure
         commands = [
@@ -65,13 +63,22 @@ module ServiceContract
         path_to_root = (Array.new(2 + module_name.split("::").length) {".."}).join("/")
         service_name = ActiveSupport::Inflector.humanize(contract_name)
         b = binding()
-        Dir.glob(File.expand_path("../../../../template/*.rb.erb", __FILE__)).each do |template|
-          erb = ERB.new(File.read(template))
+        %w(documentation.rb.erb service.rb.erb).each do |template|
           output_file = File.join(contract_name, 'lib', path, File.basename(template, ".erb"))
-          puts "writing template: #{output_file}"
-          File.open(output_file, 'w') do |file|
-            file.write(erb.result(b))
-          end
+          write_template(template, output_file, b)
+        end
+
+        write_template("module.rb.erb", File.join(contract_name, "lib", "#{path}.rb"), b)
+      end
+
+      protected
+
+      def write_template(name, output_file, bind)
+        template_folder = File.expand_path("../../../../template", __FILE__)
+        input = File.join(template_folder, name)
+        erb = ERB.new(File.read(input))
+        File.open(output_file, 'w') do |file|
+          file.write(erb.result(bind))
         end
       end
 

data/lib/service_contract/generator/version.rb

@@ -1,5 +1,5 @@
 module ServiceContract
   module Generator
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/template/module.rb.erb

@@ -0,0 +1,8 @@
+<% module_names.each do |name| %>
+module <%= name %> do
+<% end %>
+  autoload :Documentation, "<%= path %>/documentation"
+  autoload :Service, "<%= path %>/service"
+<% module_names.each do |name| %>
+end
+<% end %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: service_contract-generator
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Jeff Ching
@@ -83,10 +83,10 @@ files:
 - lib/service_contract-generator.rb
 - lib/service_contract/generator.rb
 - lib/service_contract/generator/cli.rb
-- lib/service_contract/generator/cli/contract.rb
 - lib/service_contract/generator/version.rb
 - service_contract-generator.gemspec
 - template/documentation.rb.erb
+- template/module.rb.erb
 - template/protocol.avdl.erb
 - template/service.rb.erb
 homepage: ''

data/lib/service_contract/generator/cli/contract.rb

@@ -1,66 +0,0 @@
-module ServiceContract
-  module Generator
-    module CLI
-      class Contract < Thor
-        desc "new"
-
-        desc "gem CONTRACT_NAME", "bootstraps a new service_contract"
-        def gem(contract_name)
-          path = contract_name.gsub("-", "/")
-          module_name = ActiveSupport::Inflector.camelize(path)
-
-          # create directory structure
-          commands = [
-            # create gem stub
-            %{bundle gem #{contract_name}},
-
-            # create contracts folder
-            %{mkdir -p #{contract_name}/contracts/},
-            %{touch #{contract_name}/contracts/},
-
-            # append tasks to Rakefile
-            %{echo "require 'service_contract/tasks'" >> #{contract_name}/Rakefile}
-          ]
-          commands.each do |command|
-            puts command
-            `#{command}`
-          end
-
-          # add service_contract to .gemspec
-          gemspec = "#{contract_name}/#{contract_name}.gemspec"
-          dependency_line = `grep -m 1 -n '.add_de' #{gemspec}`
-          matched = false
-          output = ""
-          File.open(gemspec, "r") do |file|
-            file.each_line do |line|
-              puts line
-              if !matched && match = line.match(/([^\.]+)\.add_de/)
-                puts "matched"
-                output += %{#{match[1]}.add_dependency "service_contract"\n}
-                matched = true
-              end
-              output += line
-            end
-          end
-          puts output
-          File.open(gemspec, "w") do |file|
-            file.write(output)
-          end
-
-          # template files
-          path_to_root = (Array.new(2 + module_name.split("::").length) {".."}).join("/")
-          service_name = ActiveSupport::Inflector.humanize(contract_name)
-          b = binding()
-          Dir.glob(File.expand_path("../../../../template/*.erb", __FILE__)).each do |template|
-            erb = ERB.new(File.read(template))
-            output_file = File.join(contract_name, 'lib', path, File.basename(template, ".erb"))
-            puts "writing template: #{output_file}"
-            File.open(output_file, 'w') do |file|
-              file.write(erb.result(b))
-            end
-          end
-        end
-      end
-    end
-  end
-end