scala-bootstrapper 0.4.0 → 0.5.0

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.5.0

data/lib/template/Capfile

@@ -0,0 +1,27 @@
+# Docs at http://confluence.local.twitter.com/display/RELEASE/Twitter-cap-utils+README
+begin
+  require 'rubygems'
+  require "bundler/setup"
+  require "railsless-deploy"
+  require 'twitter_cap_utils'
+rescue LoadError => e
+  puts e.message
+  abort "Please gem install twitter-cap-utils railsless-deploy"
+end
+
+set :user, :twitter
+set :application, "birdname"
+set :repository, "http://git.local.twitter.com/ro/#{application}"
+
+task :staging do
+  role :app, "server1", "server2", "etc"
+end
+
+task :canary do
+  role :app, "server1"
+end
+
+task :production do
+  role :app, "server1", "server2", "etc"
+end
+

data/lib/template/Gemfile

@@ -1,3 +1,6 @@
 source :rubygems
+source "http://gems.local.twitter.com"
 gem "thrift_client", "0.6"
-gem "thrift", "0.5"
+gem "thrift", "0.5"
+gem "railsless-deploy"
+gem "twitter-cap-utils", "~>0.8.0"

data/lib/template/bin/console.erb

@@ -13,8 +13,8 @@ class BirdNameClient < ThriftClient
   DEFAULTS = { :transport_wrapper => Thrift::FramedTransport }
   def initialize(servers = nil, options = {})
     if servers.nil? or servers.empty?
-      STDERR.puts "No servers specified, using 127.0.0.1:13007"
-      servers = ['127.0.0.1:13007']
+      STDERR.puts "No servers specified, using 127.0.0.1:9999"
+      servers = ['127.0.0.1:9999']
     else
       servers = Array(servers)
     end
@@ -26,4 +26,4 @@ end
 puts "Hint: the client is in the variable `$client`"
 $client = BirdNameClient.new ARGV.shift
 
-IRB.start
+IRB.start

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

@@ -1,7 +1,44 @@
-import com.twitter.birdname._
+import com.twitter.admin.config._
+import com.twitter.conversions.time._
+import com.twitter.logging.config._
+import com.twitter.birdname.config._
 
+// development mode.
 new BirdNameServiceConfig {
-  // TODO: Please implement environment-specific config, e.g.:
-  //  
-  // override val thriftPort = 31337
-}
+	
+  // Add your own config here
+  
+  // Where your service will be exposed.
+  thriftPort = 9999
+
+  // Ostrich http admin port.  Curl this for stats, etc
+  admin.httpPort = 9900
+
+  // End user configuration
+  
+  // Expert-only: Ostrich stats and logger configuration.  
+  
+  admin.statsNodes = new StatsConfig {
+    reporters = new JsonStatsLoggerConfig {
+      loggerName = "stats"
+      serviceName = "birdname"
+    } :: new TimeSeriesCollectorConfig
+  }
+
+  loggers =
+    new LoggerConfig {
+      level = Level.INFO
+      handlers = new FileHandlerConfig {
+        filename = "birdname.log"
+        roll = Policy.SigHup
+      }
+    } :: new LoggerConfig {
+      node = "stats"
+      level = Level.INFO
+      useParents = false
+      handlers = new FileHandlerConfig {
+        filename = "stats.log"
+        formatter = BareFormatterConfig
+      }
+    }
+}

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

@@ -1,7 +1,43 @@
-import com.twitter.birdname._
+import com.twitter.admin.config._
+import com.twitter.conversions.time._
+import com.twitter.logging.config._
+import com.twitter.birdname.config._
 
+// production mode.
 new BirdNameServiceConfig {
-  // TODO: Please implement environment-specific config, e.g.:
-  //  
-  // override val thriftPort = 31337
-}
+	
+  // Add your own config here
+  
+  // Where your service will be exposed.
+  thriftPort = 9999
+
+  // Ostrich http admin port.  Curl this for stats, etc
+  admin.httpPort = 9900
+
+  // End user configuration
+  
+  // Expert-only: Ostrich stats and logger configuration.
+  admin.statsNodes = new StatsConfig {
+    reporters = new JsonStatsLoggerConfig {
+      loggerName = "stats"
+      serviceName = "birdname"
+    } :: new TimeSeriesCollectorConfig
+  }
+
+  loggers =
+    new LoggerConfig {
+      level = Level.INFO
+      handlers = new FileHandlerConfig {
+        filename = "/var/log/birdname/production.log"
+        roll = Policy.SigHup
+      }
+    } :: new LoggerConfig {
+      node = "stats"
+      level = Level.INFO
+      useParents = false
+      handlers = new FileHandlerConfig {
+        filename = "stats.log"
+        formatter = BareFormatterConfig
+      }
+    }
+}

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

@@ -1,7 +1,43 @@
-import com.twitter.birdname._
+import com.twitter.admin.config._
+import com.twitter.conversions.time._
+import com.twitter.logging.config._
+import com.twitter.birdname.config._
 
+// staging mode.
 new BirdNameServiceConfig {
-  // TODO: Please implement environment-specific config, e.g.:
-  //  
-  // override val thriftPort = 31337
-}
+	
+  // Add your own config here
+  
+  // Where your service will be exposed.
+  thriftPort = 9999
+
+  // Ostrich http admin port.  Curl this for stats, etc
+  admin.httpPort = 9900
+
+  // End user configuration
+  
+  // Expert-only: Ostrich stats and logger configuration.
+  admin.statsNodes = new StatsConfig {
+    reporters = new JsonStatsLoggerConfig {
+      loggerName = "stats"
+      serviceName = "birdname"
+    } :: new TimeSeriesCollectorConfig
+  }
+
+  loggers =
+    new LoggerConfig {
+      level = Level.INFO
+      handlers = new FileHandlerConfig {
+        filename = "/var/log/birdname/production.log"
+        roll = Policy.SigHup
+      }
+    } :: new LoggerConfig {
+      node = "stats"
+      level = Level.INFO
+      useParents = false
+      handlers = new FileHandlerConfig {
+        filename = "stats.log"
+        formatter = BareFormatterConfig
+      }
+    }
+}

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

@@ -1,7 +1,32 @@
-import com.twitter.birdname._
+import com.twitter.admin.config._
+import com.twitter.conversions.time._
+import com.twitter.logging.config._
+import com.twitter.birdname.config._
 
+// test mode.
 new BirdNameServiceConfig {
-  // TODO: Please implement environment-specific config, e.g.:
-  //  
-  // override val thriftPort = 31337
-}
+	
+  // Add your own config here
+  
+  // Where your service will be exposed.
+  thriftPort = 9999
+
+  // Ostrich http admin port.  Curl this for stats, etc
+  admin.httpPort = 9900
+
+  // End user configuration
+  
+  // Expert-only: Ostrich stats and logger configuration.
+  admin.statsNodes = new StatsConfig {
+    reporters = new JsonStatsLoggerConfig {
+      loggerName = "stats"
+      serviceName = "birdname"
+    } :: new TimeSeriesCollectorConfig
+  }
+
+  loggers =
+    new LoggerConfig {
+      level = Level.INFO
+      handlers = new ConsoleHandlerConfig
+    }
+}

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

@@ -2,37 +2,34 @@ import sbt._
 import Process._
 import com.twitter.sbt._
 
-class BirdNameProject(info: ProjectInfo) extends StandardProject(info)
-                                            with CompileScalaWrappers
-                                            with SubversionPublisher
-                                            with NoisyDependencies
-                                            with DefaultRepos
-                                            with LibDirClasspath
-                                            with PackageDist
-                                            with AdhocInlines {
-                                              
-  val scalaTools = "org.scala-lang" % "scala-compiler" % "2.8.1"
-
-  val util    = "com.twitter" % "util" % "1.6.9"
-
-  val finagleC  = "com.twitter" % "finagle-core" % "1.1.23"
-  val finagleT  = "com.twitter" % "finagle-thrift" % "1.1.23"
-  val finagleO  = "com.twitter" % "finagle-ostrich3" % "1.1.23"
-
-  val ostrich  = "com.twitter" % "ostrich" % "3.0.5"
-  
+class BirdNameProject(info: ProjectInfo) extends StandardServiceProject(info)
+with CompileScalaWrappers with NoisyDependencies with DefaultRepos with SubversionPublisher {
+
+  val finagleVersion = "1.1.23"
+  val finagleC = "com.twitter" % "finagle-core" % finagleVersion
+  val finagleT = "com.twitter" % "finagle-thrift" % finagleVersion
+  val finagleO = "com.twitter" % "finagle-ostrich3" % finagleVersion
+
+  val ostrich = "com.twitter" % "ostrich" % "3.0.6"
+
+  // thrift
+  val libthrift = "thrift" % "libthrift" % "0.5.0"
   val slf4jVersion = "1.5.11"
   val slf4jApi = "org.slf4j" % "slf4j-api" % slf4jVersion withSources() intransitive()
   val slf4jBindings = "org.slf4j" % "slf4j-jdk14" % slf4jVersion withSources() intransitive()
 
-  val specs     = "org.scala-tools.testing" % "specs_2.8.1" % "1.6.7" % "test" withSources()
-  val jmock     = "org.jmock" % "jmock" % "2.4.0" % "test"
-  
   val scalaThriftTargetNamespace = "com.twitter.birdname"
   val rubyThriftNamespace = "BirdName"
-  
+
+  // for tests
+  val specs = "org.scala-tools.testing" % "specs_2.8.1" % "1.6.7" % "test" withSources()
+  val jmock = "org.jmock" % "jmock" % "2.4.0" % "test"
+  val hamcrest_all = "org.hamcrest" % "hamcrest-all" % "1.1" % "test"
+  val cglib = "cglib" % "cglib" % "2.1_3" % "test"
+  val asm = "asm" % "asm" % "1.5.3" % "test"
+  val objenesis = "org.objenesis" % "objenesis" % "1.1" % "test"
+
   override def mainClass = Some("com.twitter.birdname.Main")
-  
-  
+
   override def subversionRepository = Some("http://svn.local.twitter.com/maven<%= '-public' if is_public %>")
 }

data/lib/template/project/build.properties

@@ -1,8 +1,8 @@
 #Project properties
 #Thu Feb 24 16:45:35 PST 2011
 project.organization=com.twitter
-project.name=BirdName
+project.name=birdname
 sbt.version=0.7.4
-project.version=0.1
+project.version=1.0-SNAPSHOT
 build.scala.versions=2.8.1
 project.initialize=false

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

@@ -2,6 +2,7 @@ package com.twitter.birdname
 
 import com.twitter.util._
 import java.util.concurrent.Executors
+import config._
 
 class BirdNameServiceImpl(config: BirdNameServiceConfig) extends BirdNameService {
   val serverName = "BirdName"

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

@@ -5,8 +5,8 @@ import com.twitter.admin._
 object Main {
   def main(args: Array[String]) {
     val env = RuntimeEnvironment(this, args)
-    val impl = env.loadRuntimeConfig[BirdNameService]
-    impl.start
+    val service = env.loadRuntimeConfig[BirdNameService]
+    service.start()
   }
 }
 

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

@@ -0,0 +1,14 @@
+package com.twitter.birdname
+package config
+
+import com.twitter.admin.{RuntimeEnvironment, ServiceTracker}
+import com.twitter.admin.config._
+import com.twitter.logging.Logger
+import com.twitter.config._
+import com.twitter.logging.config._
+
+class BirdNameServiceConfig extends ServerConfig[BirdNameService] {
+  var thriftPort: Int = 9999
+
+  def apply(runtime: RuntimeEnvironment) = new BirdNameServiceImpl(this)
+}

data/scala-bootstrapper.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{scala-bootstrapper}
-  s.version = "0.4.0"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kyle Maxwell"]
-  s.date = %q{2011-03-01}
+  s.date = %q{2011-03-02}
   s.description = %q{Twitter scala project init}
   s.email = %q{kmaxwell@twitter.com}
   s.executables = ["sbt", "scala-bootstrapper"]
@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
      "bin/sbt",
      "bin/scala-bootstrapper",
      "lib/template/.gitignore",
+     "lib/template/Capfile",
      "lib/template/Gemfile",
      "lib/template/bin/console.erb",
      "lib/template/config/development.scala.erb",
@@ -36,9 +37,9 @@ Gem::Specification.new do |s|
      "lib/template/project/build.properties",
      "lib/template/project/build/BirdNameProject.scala.erb",
      "lib/template/project/plugins/Plugins.scala.erb",
-     "lib/template/src/main/scala/com/twitter/birdname/BirdNameServiceConfig.scala.erb",
      "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/test/scala/com/twitter/birdname/AbstractSpec.scala.erb",
      "lib/template/src/test/scala/com/twitter/birdname/BirdNameServiceSpec.scala.erb",

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 4
+  - 5
   - 0
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Kyle Maxwell
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-01 00:00:00 -08:00
+date: 2011-03-02 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -49,6 +49,7 @@ files:
 - bin/sbt
 - bin/scala-bootstrapper
 - lib/template/.gitignore
+- lib/template/Capfile
 - lib/template/Gemfile
 - lib/template/bin/console.erb
 - lib/template/config/development.scala.erb
@@ -58,9 +59,9 @@ files:
 - lib/template/project/build.properties
 - lib/template/project/build/BirdNameProject.scala.erb
 - lib/template/project/plugins/Plugins.scala.erb
-- lib/template/src/main/scala/com/twitter/birdname/BirdNameServiceConfig.scala.erb
 - 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/test/scala/com/twitter/birdname/AbstractSpec.scala.erb
 - lib/template/src/test/scala/com/twitter/birdname/BirdNameServiceSpec.scala.erb

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

@@ -1,24 +0,0 @@
-package com.twitter.birdname
-
-import com.twitter.admin.config._
-import com.twitter.admin._
-
-class BirdNameServiceConfig extends ServerConfig[BirdNameService] {
-  
-  val thriftPort = 1337
-  admin.httpPort = Some(9999)
-  
-  // TODO: Please implement application-specific config.
-
-  /**
-   * Used if you need to integrate synchronous clients, e.g. querulous. If you
-   * are using an async client like cassie, you can ignore this.
-   *
-   *     val threadPoolSize = 10
-   */
-  
-  /**
-   * This is a factory method that will construct the related service.
-   */
-  def apply(env: RuntimeEnvironment) = new BirdNameServiceImpl(this)
-}