scala-bootstrapper 0.7.0 → 0.7.2

data/VERSION

@@ -1 +1 @@
-0.7.0
+0.7.2

data/bin/scala-bootstrapper

@@ -4,13 +4,13 @@ require File.dirname(__FILE__) + "/../vendor/trollop"
 
 opts = Trollop::options do
   banner "Usage: #{$0} [options] PROJECT_NAME"
-  
-  opt :public, "Use the public twitter maven repo"  
+
+  opt :public, "Use the public twitter maven repo"
   opt :namespace, "Use something besides com.twitter", :type => :string
 end
 
 
-if ARGV.length < 1 
+if ARGV.length < 1
   Trollop::die "PROJECT_NAME is required"
   exit 1
 end
@@ -22,7 +22,7 @@ class String
     else
       self[0].chr.downcase + camelize(self)[1..-1]
     end
-  end    
+  end
   def underscore
     self.gsub(/::/, '/').
     gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
@@ -72,4 +72,8 @@ Dir["#{root}/**/*"].select{|path| File.file?(path)}.each do |path|
   puts "writing #{target_path}"
   mkdir_p(File.dirname(target_path))
   File.open(target_path, "w") {|f| f.print(gsub_birds(template.result(binding), project_name, namespace)) }
-end
+end
+
+if File.exists?("src/scripts/startup.sh")
+  `mv src/scripts/startup.sh src/scripts/#{project_name.downcase}.sh`
+end

data/lib/template/config/development.scala.erb

@@ -1,6 +1,6 @@
-import com.twitter.ostrich.admin.config._
 import com.twitter.conversions.time._
 import com.twitter.logging.config._
+import com.twitter.ostrich.admin.config._
 import com.twitter.birdname.config._
 
 // development mode.
@@ -27,7 +27,7 @@ new BirdNameServiceConfig {
 
   loggers =
     new LoggerConfig {
-      level = Level.INFO
+      level = Level.DEBUG
       handlers = new FileHandlerConfig {
         filename = "birdname.log"
         roll = Policy.SigHup

data/lib/template/config/production.scala.erb

@@ -1,6 +1,6 @@
-import com.twitter.ostrich.admin.config._
 import com.twitter.conversions.time._
 import com.twitter.logging.config._
+import com.twitter.ostrich.admin.config._
 import com.twitter.birdname.config._
 
 // production mode.

data/lib/template/config/test.scala.erb

@@ -1,6 +1,6 @@
-import com.twitter.ostrich.admin.config._
 import com.twitter.conversions.time._
 import com.twitter.logging.config._
+import com.twitter.ostrich.admin.config._
 import com.twitter.birdname.config._
 
 // test mode.

data/lib/template/project/build.properties

@@ -3,6 +3,6 @@
 project.organization=com.twitter
 project.name=birdname
 sbt.version=0.7.4
-project.version=1.0-SNAPSHOT
+project.version=1.0.0-SNAPSHOT
 build.scala.versions=2.8.1
 project.initialize=false

data/lib/template/project/build/BirdNameProject.scala.erb

@@ -2,9 +2,19 @@ import sbt._
 import Process._
 import com.twitter.sbt._
 
+/**
+ * Sbt project files are written in a DSL in scala.
+ *
+ * The % operator is just turning strings into maven dependency declarations, so lines like
+ *     val example = "com.example" % "exampleland" % "1.0.3"
+ * mean to add a dependency on exampleland version 1.0.3 from provider "com.example".
+ */
 class BirdNameProject(info: ProjectInfo) extends StandardServiceProject(info)
-with CompileThriftScala with NoisyDependencies with DefaultRepos with SubversionPublisher {
-
+  with CompileThriftScala
+  with NoisyDependencies
+  with DefaultRepos
+  with SubversionPublisher
+{
   val finagleVersion = "1.2.1"
   val finagleC = "com.twitter" % "finagle-core" % finagleVersion
   val finagleT = "com.twitter" % "finagle-thrift" % finagleVersion
@@ -12,7 +22,6 @@ with CompileThriftScala with NoisyDependencies with DefaultRepos with Subversion
 
   // thrift
   val libthrift = "thrift" % "libthrift" % "0.5.0"
-  val util    = "com.twitter" % "util" % "1.8.0"
 
   override def originalThriftNamespaces = Map("BirdName" -> "com.twitter.birdname.thrift")
   val scalaThriftTargetNamespace = "com.twitter.birdname"

data/lib/template/project/plugins/Plugins.scala.erb

@@ -2,6 +2,6 @@ import sbt._
 
 class Plugins(info: ProjectInfo) extends PluginDefinition(info) {
   val twitterMaven = "twitter.com" at "http://maven.twttr.com/"
-  val defaultProject = "com.twitter" % "standard-project" % "0.11.1"
+  val standardProject = "com.twitter" % "standard-project" % "0.11.1"
   val sbtThrift = "com.twitter" % "sbt-thrift" % "1.1.0"
 }

data/lib/template/run

@@ -0,0 +1,125 @@
+#!/bin/bash
+
+function path_append {
+  _var=$1
+  _path=$2
+  eval "
+    if [[ -z \"\$$_var\" ]] ; then
+      export $_var=$_path
+    elif ! echo \$$_var | egrep -q \"(^|:)$_path($|:)\" ; then
+      export $_var=\$$_var:$_path
+    fi"
+}
+
+function path_prepend() {
+    _var=$1
+    _path=$2
+    eval "
+    if [[ -z \"\$$_var\" ]] ; then
+      export $_var=$_path
+    elif ! echo \$$_var | egrep -q \"(^|:)$_path($|:)\" ; then
+      export $_var=$_path:\$$_var
+    fi"
+}
+
+function find_sbt_root {
+  while [ ! -d project -a "x$PWD" != "x/" ] ; do
+    cd ..
+  done
+
+  if [ "x$PWD" = "/" ]; then
+    echo "couldn't find sbt project!" 1>&2
+    exit 1
+  fi
+
+  echo $PWD
+}
+
+function ensure_java_bin_on_path {
+  if [ -d "$JAVA_HOME" ]; then
+      __java_bindir="$JAVA_HOME/bin"
+  else
+      __java_bindir=`which java | xargs readlink | xargs dirname`
+  fi
+
+  if [ -x "$__java_bindir/java" ]; then
+    path_append PATH $__java_bindir
+  else
+    echo "Binary 'java' is not on the PATH, and JAVA_HOME is not set. Fix one of these."
+    exit 1
+  fi
+}
+
+function include {
+  _var=$1
+  _dir=$2
+
+  for jar in $_dir/lib_managed/compile/*.jar; do
+    path_append $_var $jar
+  done
+
+  for jar in $_dir/lib/*.jar; do
+    path_append $_var $jar
+  done
+
+  path_append $_var $_dir/src/main/resources
+  path_append $_var $_dir/target/classes
+}
+
+ensure_java_bin_on_path
+
+root=$(find_sbt_root)
+if [ $? -ne 0 ]; then
+  exit 1
+fi
+
+if [ -z $project ]; then
+  project="."
+fi
+
+set -- $(getopt i:ygdh: "$@")
+while [ $# -gt 0 ]; do
+  case "$1" in
+    -i)
+      include CP $2
+      ;;
+    -y)
+      JAVA_OPTS="-agentlib:yjpagent $JAVA_OPTS"
+      ;;
+    -g)
+      GC_OPTS="-verbosegc -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -XX:+PrintGCDateStamps -Xloggc:/tmp/gc.log"
+      ;;
+    -d)
+      JAVA_OPTS="-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n $JAVA_OPTS"
+      ;;
+    -h)
+      path_prepend DYLD_LIBRARY_PATH $2
+      JAVA_OPTS="-Xbootclasspath/a:$2 -agentlib:heapster $JAVA_OPTS"
+      ;;
+    --) shift; break;;
+  esac
+  shift
+done
+
+if [ $# -eq 0 ]; then
+    echo "usage: $0 [-i INCLUDE] [-h HEAPSTER] [-ygd] CLASS ..." >&2
+    echo "  -i INCLUDE include in the classpath the project with the sbt root INCLUDE" >&2 
+    echo "  -h HEAPSTER use heapster in the directory HEAPSTER"  >&2
+    echo "  -y enable yourkit debugging" >&2
+    echo "  -g enable GC debugging/logging" >&2
+    echo "  -d enable JVM debugging" >&2
+    exit 1
+fi
+
+## Set up the classpath. Scala base jars first.
+path_prepend CP $root/project/boot/scala-2.8.1/lib/scala-library.jar
+path_prepend CP $root/project/boot/scala-2.8.1/lib/scala-compiler.jar
+
+# This goes last:
+include CP $root
+
+# Disable IPv6
+export JAVA_OPTS="-Djava.net.preferIPv4Stack=true $JAVA_OPTS"
+
+export JAVA_OPTS="$JAVA_OPTS -server -Xmx2G -XX:MaxPermSize=256m -XX:+UseConcMarkSweepGC -XX:+UseParNewGC $GC_OPTS"
+exec java $JAVA_OPTS -cp $CP "$@"

data/lib/template/src/main/scala/com/twitter/birdname/BirdNameServiceImpl.scala.erb

@@ -1,7 +1,8 @@
 package com.twitter.birdname
 
-import com.twitter.util._
 import java.util.concurrent.Executors
+import scala.collection.mutable
+import com.twitter.util._
 import config._
 
 class BirdNameServiceImpl(config: BirdNameServiceConfig) extends BirdNameServiceServer {
@@ -22,11 +23,23 @@ class BirdNameServiceImpl(config: BirdNameServiceConfig) extends BirdNameService
    *     }
    * 
    */   
-    
-  // TODO: Please implement your api.  You should have already created your thrift definition.
-  
-  def hello() = {
-    Future("world")
+
+  val database = new mutable.HashMap[String, String]()  
+
+  def get(key: String) = {
+    database.get(key) match {
+      case None =>
+        log.debug("get %s: miss", key)
+        Future.exception(new BirdNameException("No such key"))
+      case Some(value) =>
+        log.debug("get %s: hit", key)
+        Future(value)
+    }
   }
 
-}
+  def put(key: String, value: String) = {
+    log.debug("put %s")
+    database(key) = value
+    Future.void
+  }
+}

data/lib/template/src/main/scala/com/twitter/birdname/Main.scala.erb

@@ -1,6 +1,6 @@
 package com.twitter.birdname
 
-import com.twitter.ostrich.admin._
+import com.twitter.ostrich.admin.RuntimeEnvironment
 
 object Main {
   def main(args: Array[String]) {

data/lib/template/src/main/scala/com/twitter/birdname/config/BirdNameServiceConfig.scala.erb

@@ -1,10 +1,11 @@
 package com.twitter.birdname
 package config
 
-import com.twitter.ostrich.admin.{RuntimeEnvironment, ServiceTracker}
-import com.twitter.ostrich.admin.config._
 import com.twitter.logging.Logger
 import com.twitter.logging.config._
+import com.twitter.ostrich.admin.{RuntimeEnvironment, ServiceTracker}
+import com.twitter.ostrich.admin.config._
+import com.twitter.util.Config
 
 class BirdNameServiceConfig extends ServerConfig[BirdNameServiceServer] {
   var thriftPort: Int = 9999

data/lib/template/src/main/thrift/birdname.thrift.erb

@@ -1,12 +1,20 @@
 namespace java com.twitter.birdname.thrift
 namespace rb BirdName
 
+/**
+ * It's considered good form to declare an exception type for your service.
+ * Thrift will serialize and transmit them transparently.
+ */
 exception BirdNameException {
   1: string description
 }
 
+/**
+ * A simple memcache-like service, which stores strings by key/value.
+ * You should replace this with your actual service.
+ */
 service BirdNameService {
-  // TODO: Please implement your externally accessible API
-  
-  string hello() throws(1: BirdNameException ex)
-}
+  string get(1: string key) throws(1: BirdNameException ex)
+
+  void put(1: string key, 2: string value)
+}

data/lib/template/{bin → src/scripts}/console.erb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-$: << File.dirname(__FILE__) + "/../target/gen-rb"
+$: << File.dirname(__FILE__) + "/../../../target/gen-rb"
 
 require "rubygems"
 require "bundler/setup"

data/lib/template/src/scripts/startup.sh

@@ -0,0 +1,136 @@
+#!/bin/sh
+#
+# birdname init.d script.
+#
+# All java services require the same directory structure:
+#   /usr/local/$APP_NAME
+#   /var/log/$APP_NAME
+#   /var/run/$APP_NAME
+
+APP_NAME="birdname"
+ADMIN_PORT="9900"
+VERSION="@VERSION@"
+APP_HOME="/usr/local/$APP_NAME/current"
+DAEMON="/usr/local/bin/daemon"
+
+JAR_NAME="$APP_NAME-$VERSION.jar"
+STAGE="production"
+
+HEAP_OPTS="-Xmx4096m -Xms4096m -XX:NewSize=768m"
+GC_OPTS="-verbosegc -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -XX:+PrintGCDateStamps -XX:+UseConcMarkSweepGC -XX:+UseParNewGC"
+GC_LOG="-Xloggc:/var/log/$APP_NAME/gc.log"
+DEBUG_OPTS="-XX:ErrorFile=/var/log/$APP_NAME/java_error%p.log"
+JAVA_OPTS="-server -Dstage=$STAGE $GC_OPTS $GC_LOG $HEAP_OPTS $DEBUG_OPTS"
+
+pidfile="/var/run/$APP_NAME/$APP_NAME.pid"
+daemon_pidfile="/var/run/$APP_NAME/$APP_NAME-daemon.pid"
+daemon_args="--name $APP_NAME --pidfile $daemon_pidfile --core --chdir /"
+daemon_start_args="--stdout=/var/log/$APP_NAME/stdout --stderr=/var/log/$APP_NAME/error"
+
+function running() {
+  $DAEMON $daemon_args --running
+}
+
+function find_java() {
+  if [ ! -z "$JAVA_HOME" ]; then
+    return
+  fi
+  for dir in /opt/jdk /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home /usr/java/default; do
+    if [ -x $dir/bin/java ]; then
+      JAVA_HOME=$dir
+      break
+    fi
+  done
+}
+
+find_java
+
+
+case "$1" in
+  start)
+    echo -n "Starting $APP_NAME... "
+
+    if [ ! -r $APP_HOME/$JAR_NAME ]; then
+      echo "FAIL"
+      echo "*** $APP_NAME jar missing: $APP_HOME/$JAR_NAME - not starting"
+      exit 1
+    fi
+    if [ ! -x $JAVA_HOME/bin/java ]; then
+      echo "FAIL"
+      echo "*** $JAVA_HOME/bin/java doesn't exist -- check JAVA_HOME?"
+      exit 1
+    fi
+    if running; then
+      echo "already running."
+      exit 0
+    fi
+    
+    ulimit -c unlimited || echo -n " (no coredump)"
+    $DAEMON $daemon_args $daemon_start_args -- sh -c "echo "'$$'" > $pidfile; exec ${JAVA_HOME}/bin/java ${JAVA_OPTS} -jar ${APP_HOME}/${JAR_NAME}"
+    tries=0
+    while ! running; do
+      tries=$((tries + 1))
+      if [ $tries -ge 5 ]; then
+        echo "FAIL"
+        exit 1
+      fi
+      sleep 1
+    done
+    echo "done."
+  ;;
+
+  stop)
+    echo -n "Stopping $APP_NAME... "
+    if ! running; then
+      echo "wasn't running."
+      exit 0
+    fi
+
+    curl -s http://localhost:${ADMIN_PORT}/shutdown.txt > /dev/null
+    tries=0
+    while running; do
+      tries=$((tries + 1))
+      if [ $tries -ge 15 ]; then
+        echo "FAILED SOFT SHUTDOWN, TRYING HARDER"
+        if [ -f $pidfile ]; then
+          kill $(cat $pidfile)
+        else
+          echo "CAN'T FIND PID, TRY KILL MANUALLY"
+          exit 1
+        fi
+        hardtries=0
+        while running; do
+          hardtries=$((hardtries + 1))
+          if [ $hardtries -ge 5 ]; then
+            echo "FAILED HARD SHUTDOWN, TRY KILL -9 MANUALLY"
+            exit 1
+          fi
+          sleep 1
+        done
+      fi
+      sleep 1
+    done
+    echo "done."
+  ;;
+  
+  status)
+    if running; then
+      echo "$APP_NAME is running."
+    else
+      echo "$APP_NAME is NOT running."
+    fi
+  ;;
+
+  restart)
+    $0 stop
+    sleep 2
+    $0 start
+  ;;
+
+  *)
+    echo "Usage: /etc/init.d/${APP_NAME}.sh {start|stop|restart|status}"
+    exit 1
+  ;;
+esac
+
+exit 0

data/lib/template/src/test/scala/com/twitter/birdname/AbstractSpec.scala.erb

@@ -15,4 +15,4 @@ abstract class AbstractSpec extends Specification {
     ServiceTracker.shutdown // all services
     out
   }
-}
+}

data/lib/template/src/test/scala/com/twitter/birdname/BirdNameServiceSpec.scala.erb

@@ -3,10 +3,12 @@ package com.twitter.birdname
 class BirdNameServiceSpec extends AbstractSpec {
   "BirdNameService" should {
 
-    // TODO: Please implement your own tests
+    // TODO: Please implement your own tests.
 
-    "hello world" in {
-      birdName.hello.get() mustEqual "world"
+    "set a key, get a key" in {
+      birdName.put("name", "bluebird")()
+      birdName.get("name")() mustEqual "bluebird"
+      birdName.get("what?")() must throwA[Exception]
     }
   }
-}
+}

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: scala-bootstrapper
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 7
+  prerelease: 
   segments: 
   - 0
   - 7
-  - 0
-  version: 0.7.0
+  - 2
+  version: 0.7.2
 platform: ruby
 authors: 
 - Kyle Maxwell
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-11 00:00:00 -08:00
+date: 2011-03-20 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thoughtbot-shoulda
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -41,7 +44,6 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
-- .gitignore
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -51,7 +53,6 @@ files:
 - lib/template/.gitignore
 - lib/template/Capfile
 - lib/template/Gemfile
-- lib/template/bin/console.erb
 - lib/template/config/development.scala.erb
 - lib/template/config/production.scala.erb
 - lib/template/config/staging.scala.erb
@@ -59,10 +60,13 @@ files:
 - lib/template/project/build.properties
 - lib/template/project/build/BirdNameProject.scala.erb
 - lib/template/project/plugins/Plugins.scala.erb
+- lib/template/run
 - lib/template/src/main/scala/com/twitter/birdname/BirdNameServiceImpl.scala.erb
 - lib/template/src/main/scala/com/twitter/birdname/Main.scala.erb
 - lib/template/src/main/scala/com/twitter/birdname/config/BirdNameServiceConfig.scala.erb
 - lib/template/src/main/thrift/birdname.thrift.erb
+- lib/template/src/scripts/console.erb
+- lib/template/src/scripts/startup.sh
 - lib/template/src/test/scala/com/twitter/birdname/AbstractSpec.scala.erb
 - lib/template/src/test/scala/com/twitter/birdname/BirdNameServiceSpec.scala.erb
 - vendor/sbt-launch-0.7.4.jar
@@ -72,28 +76,32 @@ homepage: http://github.com/fizx/scala-bootstrapper
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Twitter scala project init

data/.gitignore

@@ -1,21 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC