boiler 0.0.10 → 0.0.11

data/bin/boiler

@@ -34,6 +34,24 @@ Escort::App.create do |app|
     end
   end
 
+  app.command(:gem) do |command|
+    command.summary "Create boilerplate for a new gem"
+    command.description "Create all boilerplate for a new gem"
+
+    command.action do |options, arguments|
+      Boiler::Generator::Gem.new(options, arguments).execute
+    end
+  end
+
+  app.command(:thrift) do |command|
+    command.summary "Create a brand new Thrift service repo"
+    command.description "Create a brand new Thrift service repo"
+
+    command.action do |options, arguments|
+      Boiler::Generator::Thrift.new(options, arguments).execute
+    end
+  end
+
   app.action do |options, arguments|
     raise "Must provide an argument. Run -h for options."
   end

data/boiler.gemspec

@@ -22,4 +22,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'chalk-rake'
   gem.add_dependency 'escort'
   gem.add_dependency 'chalk-log'
+  gem.add_dependency 'rubysh'
 end

data/lib/boiler/gem_related.rb

@@ -0,0 +1,15 @@
+module Boiler
+  module GemRelated
+    def gem
+      File.basename(@directory)
+    end
+
+    def server
+      gem.split('-')[-1]
+    end
+
+    def module
+      gem.split('-').map {|c| c.capitalize}.join('::')
+    end
+  end
+end

data/lib/boiler/generator/base.rb

@@ -1,10 +1,13 @@
 require 'fileutils'
+require 'rubysh'
 require 'chalk-log'
 
 module Boiler::Generator
   class Base
     include Chalk::Log
 
+    attr_reader :options, :arguments
+
     def initialize(options, arguments)
       @options = options
       @arguments = arguments
@@ -16,6 +19,43 @@ module Boiler::Generator
 
     protected
 
+    # Manipulations
+
+    def directory
+      raise "Must set @directory to the base" unless @directory
+      @directory
+    end
+
+    def relative_mkdir(subdir)
+      path = path(subdir)
+      mkdir(path)
+    end
+
+    def relative_write_file(file, contents)
+      path = path(file)
+      write_file(path, contents)
+    end
+
+    def relative_rm_r(tree)
+      path = path(tree)
+      rm_r(path)
+    end
+
+    def relative_mv(src, dst)
+      src_path = path(src)
+      dst_path = path(dst)
+      mv(src_path, dst_path)
+    end
+
+    def relative_chmod(perms, file)
+      path = path(file)
+      chmod(perms, path)
+    end
+
+    def path(file)
+      File.join(directory, file)
+    end
+
     def write_file(file, contents)
       log.info('writing file', :bytes => contents.bytesize, :file => file)
       # TODO: disable O_CREAT
@@ -37,5 +77,83 @@ module Boiler::Generator
       log.info('mkdir', :dir => dir)
       FileUtils.mkdir(dir)
     end
+
+    def rm_r(tree)
+      log.info('rm -r', :tree => tree)
+      FileUtils.rm_r(tree)
+    end
+
+    def mv(src, dst)
+      log.info('mv', :src => src, :dst => dst)
+      FileUtils.mv(src, dst)
+    end
+
+    def rubysh(*cmd)
+      log.info('rubysh', :cmd => cmd)
+      Rubysh.check_call(*cmd)
+    end
+
+    def commit(message)
+      Rubysh.check_call('git', 'add', '--all', '.', :cwd => directory)
+      Rubysh.check_call('git', 'commit', '-m', message, :cwd => directory)
+    end
+
+    # Check for files
+
+    def get_gemspec
+      glob = path('*.gemspec')
+      gemspecs = Dir[glob]
+      if gemspecs.length == 0
+        raise "No gemspec found matching #{glob}!"
+      elsif gemspecs.length > 1
+        raise "Found #{gemspecs.length} gemspecs matching #{glob}!"
+      end
+      gemspecs[0]
+    end
+
+    def get_rakefile
+      path = path('Rakefile')
+      raise "No Rakefile found at #{path}" unless File.exists?(path)
+      path
+    end
+
+    def get_gemfile
+      path = path('Gemfile')
+      raise "No Gemfile found at #{path}" unless File.exists?(path)
+      path
+    end
+
+    def get_license
+      path = path('LICENSE.txt')
+      raise "No Gemfile found at #{path}" unless File.exists?(path)
+
+      # Look in environment
+      owner = ENV['BOILER_OWNER']
+
+      # Look in git config
+      unless owner
+        begin
+          runner = rubysh('git', 'config', 'boiler.owner', Rubysh.>)
+        rescue Rubysh::Error::BadExitError
+        else
+          output = runner.read.chomp
+          owner = output if output.length > 0
+        end
+      end
+
+      unless owner
+        log.error("No license owner set (this is used for touching up the LICENSE.txt file). License owner is extracted from ENV['BOILER_OWNER'], followed by `git config boiler.owner'.")
+        owner = Readline.readline("Provide your code's license owner: ")
+        rubysh('git', 'config', '--global', 'boiler.owner', owner)
+      end
+
+      [path, owner]
+    end
+
+    def get_gitignore
+      path = path('.gitignore')
+      raise "No .gitignore found at #{path}" unless File.exists?(path)
+      path
+    end
   end
 end

data/lib/boiler/generator/gem.rb

@@ -0,0 +1,45 @@
+module Boiler::Generator
+  class Gem < Base
+    include Boiler::GemRelated
+
+    def execute
+      raise "Must provide a base directory" unless @directory = @arguments.first
+      raise "Directory #{directory} already exists" if File.exists?(directory)
+
+      Rubysh.check_call('bundle', 'gem', directory)
+      Touchup.new(options, arguments).execute
+      Suite.new(options, arguments).execute
+
+      fix_nesting
+      commit("Initial commit (generated via `boiler gem')")
+    end
+
+    private
+
+    def fix_nesting
+      # Create lib/chalk-my-thing
+      relative_mkdir("lib/#{gem}")
+
+      # Move version file to lib/chalk-my-thing/version.rb
+      relative_mv("lib/#{gem.gsub('-', '/')}/version.rb", "lib/#{gem}/version.rb")
+
+      # Create lib/chalk-my-thing.rb
+      relative_write_file("lib/#{gem}.rb", <<EOF)
+require '#{gem}/version'
+
+module #{self.module}
+end
+EOF
+
+      # Nuke the now-unneeded lib/chalk/my... directory
+      relative_rm_r("lib/#{gem.split('-')[0]}")
+
+      # Update the gemspec to require 'chalk-my-thing/version' rather
+      # than 'chalk/my/thing/version'
+      gemspec = get_gemspec
+      contents = File.read(gemspec)
+      contents = contents.gsub(/^require '.*$/, "require '#{gem}/version'")
+      write_file(gemspec, contents)
+    end
+  end
+end

data/lib/boiler/generator/script.rb

@@ -16,56 +16,22 @@ module Boiler::Generator
     def template
       <<-EOF
 #!/usr/bin/env ruby
-require 'logger'
-require 'optparse'
 
-$log = Logger.new(STDOUT)
-$log.level = Logger::WARN
+require 'chalk-cli'
 
-module MyScript
-  class MyRunner
-    def initialize
-    end
-
-    def run
-    end
+class ExampleCommand < Chalk::CLI::Command
+  def invoke
+    log.info("Shaving \#{options[:yaks]} yaks...")
   end
-end
-
-def main
-  options = {}
-  optparse = OptionParser.new do |opts|
-    opts.banner = "Usage: \#{$0} [options]"
-
-    opts.on('-v', '--verbosity', 'Verbosity of debugging output') do
-      $log.level -= 1
-    end
 
-    opts.on('-h', '--help', 'Display this message') do
-      puts opts
-      exit(1)
-    end
-  end
-  optparse.parse!
-
-  if ARGV.length != 0
-    puts optparse
-    return 1
+  App = Chalk::CLI::App.new("Usage: \#{$0} [OPTIONS] ARGS")
+  App.action(self)
+  App.options do |opts|
+    opts.opt :yaks, "How many yaks to shave", :short => 'y', :default => 1
   end
-
-  runner = MyScript::MyRunning.new
-  runner.run
-  return 0
 end
 
-if $0 == __FILE__
-  ret = main
-  begin
-    exit(ret)
-  rescue TypeError
-    exit(0)
-  end
-end
+ExampleCommand::App.run_if_invoked(__FILE__)
 EOF
     end
   end

data/lib/boiler/generator/suite.rb

@@ -10,20 +10,6 @@ module Boiler::Generator
 
     private
 
-    def relative_mkdir(subdir)
-      path = path(subdir)
-      mkdir(path)
-    end
-
-    def relative_write_file(file, contents)
-      path = path(file)
-      write_file(path, contents)
-    end
-
-    def path(file)
-      File.join(@directory, file)
-    end
-
     def make_subdirectories
       [
         'test',

data/lib/boiler/generator/thrift.rb

@@ -0,0 +1,128 @@
+module Boiler::Generator
+  class Thrift < Base
+    include Boiler::GemRelated
+
+    def execute
+      Gem.new(options, arguments).execute
+
+      @directory = @arguments.first
+      @port = rand(8976) + 1024
+
+      relative_mkdir('bin')
+      create_server
+      create_client
+      create_thrift_rb
+      create_thrift_dir
+      add_dependencies
+      commit("Add thrift boilerplate (generated via `boiler thrift')")
+    end
+
+    private
+
+    def create_server
+      relative_write_file("bin/#{server}_server.rb", <<EOF)
+#!/usr/bin/env ruby
+require 'bundler/setup'
+require '#{gem}'
+
+Thrifty.require('#{server}_service')
+
+class #{self.module}::#{server.capitalize}Server < Chalk::Thrift::Server::Base
+  interface #{self.module}::Thrift::#{server.capitalize}Service
+  set :port, #{@port}
+
+  def example(arg)
+    'hi'
+  end
+end
+
+def einhorn_main
+  main
+end
+
+def main
+  #{self.module}::#{server.capitalize}Server.run!
+  return 0
+end
+
+if $0 == __FILE__
+  ret = main
+  begin
+    exit(ret)
+  rescue TypeError
+    exit(0)
+  end
+end
+EOF
+      relative_chmod(0755, "bin/#{server}_server.rb")
+    end
+
+    def create_client
+      relative_write_file("bin/#{server}_client.rb", <<EOF)
+#!/usr/bin/env ruby
+
+require 'bundler/setup'
+require 'chalk-cli'
+require '#{gem}'
+
+Thrifty.require('#{server}_service')
+
+class #{self.module}::Client < Chalk::CLI::Command
+  def invoke
+    thrift_client = Chalk::Thrift::Client::Base.new(
+      ['127.0.0.1:#{@port}'],
+      :interface => #{self.module}::Thrift::#{server.capitalize}Service
+      )
+    result = thrift_client.example('argument')
+    puts result
+  end
+
+  App = Chalk::CLI::App.new("Usage: #{$0} [OPTIONS] ARGS")
+  App.action(self)
+end
+
+#{self.module}::Client::App.run_if_invoked(__FILE__)
+EOF
+      relative_chmod(0755, "bin/#{server}_client.rb")
+    end
+
+    def create_thrift_rb
+      relative_write_file("lib/#{gem}/thrift.rb", <<EOF)
+require 'chalk-thrift'
+require 'thrifty'
+Thrifty.register('thrift/#{server}.thrift',
+  relative_to: File.join(__FILE__, '../..')
+  )
+EOF
+
+      gem_rb = path("lib/#{gem}.rb")
+      contents = File.read(gem_rb)
+      split = contents.split("\n")
+      split.insert(1, "require '#{gem}/thrift'")
+      write_file(gem_rb, split.join("\n"))
+    end
+
+    def create_thrift_dir
+      relative_mkdir('thrift')
+      relative_write_file("thrift/#{server}.thrift", <<EOF)
+namespace rb #{self.module.gsub('::', '.')}.Thrift
+
+service #{server.capitalize}Service {
+  string example(1: string arg);
+}
+EOF
+    end
+
+    def add_dependencies
+      gemspec = get_gemspec
+      contents = File.read(gemspec)
+      contents = contents.gsub(/^end$/, <<EOF.chomp)
+  spec.add_dependency 'chalk-thrift'
+  spec.add_dependency 'thrifty'
+  spec.add_dependency 'chalk-cli'
+end
+EOF
+      write_file(gemspec, contents)
+    end
+  end
+end

data/lib/boiler/generator/touchup.rb

@@ -1,3 +1,5 @@
+require 'readline'
+
 module Boiler::Generator
   class Touchup < Base
     def execute
@@ -8,10 +10,14 @@ module Boiler::Generator
       gemspec = get_gemspec
       rakefile = get_rakefile
       gemfile = get_gemfile
+      license, owner = get_license
+      gitignore = get_gitignore
 
       modify_gemspec(gemspec)
       modify_rakefile(rakefile)
       modify_gemfile(gemfile)
+      modify_license(license, owner)
+      modify_gitignore(gitignore)
     end
 
     private
@@ -20,29 +26,6 @@ module Boiler::Generator
       File.join(@directory, file)
     end
 
-    def get_gemspec
-      glob = path('*.gemspec')
-      gemspecs = Dir[glob]
-      if gemspecs.length == 0
-        raise "No gemspec found matching #{glob}!"
-      elsif gemspecs.length > 1
-        raise "Found #{gemspecs.length} gemspecs matching #{glob}!"
-      end
-      gemspecs[0]
-    end
-
-    def get_rakefile
-      path = path('Rakefile')
-      raise "No Rakefile found at #{path}" unless File.exists?(path)
-      path
-    end
-
-    def get_gemfile
-      path = path('Gemfile')
-      raise "No Gemfile found at #{path}" unless File.exists?(path)
-      path
-    end
-
     def modify_gemspec(gemspec)
       lines = File.read(gemspec).gsub('"', "'").split("\n")
       index = lines.index {|line| line =~ /(gem|spec)\.require_paths/}
@@ -95,5 +78,22 @@ EOF
       end
       contents = write_file(gemfile, contents)
     end
+
+    def modify_license(license, owner)
+      contents = File.read(license)
+      contents = contents.gsub(/\A(Copyright.*\d+ )(.*)/, '\1' + owner)
+      old_owner = $2
+
+      unless owner == old_owner
+        log.info('license update', :old_owner => old_owner, :owner => owner)
+        contents = write_file(license, contents)
+      end
+    end
+
+    def modify_gitignore(gitignore)
+      append_to_file(gitignore, <<EOF)
+build-thrifty
+EOF
+    end
   end
 end

data/lib/boiler/generator.rb

@@ -2,6 +2,8 @@ module Boiler::Generator
 end
 
 require 'boiler/generator/base'
+require 'boiler/generator/gem'
 require 'boiler/generator/script'
 require 'boiler/generator/suite'
 require 'boiler/generator/touchup'
+require 'boiler/generator/thrift'

data/lib/boiler/version.rb

@@ -1,3 +1,3 @@
 module Boiler
-  VERSION = '0.0.10'
+  VERSION = '0.0.11'
 end

data/lib/boiler.rb

@@ -2,4 +2,5 @@ module Boiler
 end
 
 require 'boiler/version'
+require 'boiler/gem_related'
 require 'boiler/generator'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: boiler
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-18 00:00:00.000000000 Z
+date: 2013-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -107,6 +107,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubysh
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A boilerplate generator
 email:
 - gdb@gregbrockman.com
@@ -123,10 +139,13 @@ files:
 - bin/boiler
 - boiler.gemspec
 - lib/boiler.rb
+- lib/boiler/gem_related.rb
 - lib/boiler/generator.rb
 - lib/boiler/generator/base.rb
+- lib/boiler/generator/gem.rb
 - lib/boiler/generator/script.rb
 - lib/boiler/generator/suite.rb
+- lib/boiler/generator/thrift.rb
 - lib/boiler/generator/touchup.rb
 - lib/boiler/version.rb
 homepage: ''
@@ -143,7 +162,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -780451879940532576
+      hash: 2570016117693499363
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -152,7 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -780451879940532576
+      hash: 2570016117693499363
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23