scala-bootstrapper 0.6.0 → 0.7.0

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.7.0

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

@@ -1,4 +1,4 @@
-import com.twitter.admin.config._
+import com.twitter.ostrich.admin.config._
 import com.twitter.conversions.time._
 import com.twitter.logging.config._
 import com.twitter.birdname.config._

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

@@ -1,4 +1,4 @@
-import com.twitter.admin.config._
+import com.twitter.ostrich.admin.config._
 import com.twitter.conversions.time._
 import com.twitter.logging.config._
 import com.twitter.birdname.config._

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

@@ -1,4 +1,4 @@
-import com.twitter.admin.config._
+import com.twitter.ostrich.admin.config._
 import com.twitter.conversions.time._
 import com.twitter.logging.config._
 import com.twitter.birdname.config._

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

@@ -1,4 +1,4 @@
-import com.twitter.admin.config._
+import com.twitter.ostrich.admin.config._
 import com.twitter.conversions.time._
 import com.twitter.logging.config._
 import com.twitter.birdname.config._

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

@@ -3,24 +3,24 @@ import Process._
 import com.twitter.sbt._
 
 class BirdNameProject(info: ProjectInfo) extends StandardServiceProject(info)
-with CompileScalaWrappers with NoisyDependencies with DefaultRepos with SubversionPublisher {
+with CompileThriftScala with NoisyDependencies with DefaultRepos with SubversionPublisher {
 
-  val finagleVersion = "1.1.23"
+  val finagleVersion = "1.2.1"
   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"
+  val finagleO = "com.twitter" % "finagle-ostrich4" % finagleVersion
 
   // 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"
+  
   val slf4jVersion = "1.5.11"
   val slf4jApi = "org.slf4j" % "slf4j-api" % slf4jVersion withSources() intransitive()
   val slf4jBindings = "org.slf4j" % "slf4j-jdk14" % slf4jVersion withSources() intransitive()
 
-  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"

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

@@ -2,5 +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.10.5-scala"
+  val defaultProject = "com.twitter" % "standard-project" % "0.11.1"
+  val sbtThrift = "com.twitter" % "sbt-thrift" % "1.1.0"
 }

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

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

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

@@ -1,11 +1,11 @@
 package com.twitter.birdname
 
-import com.twitter.admin._
+import com.twitter.ostrich.admin._
 
 object Main {
   def main(args: Array[String]) {
     val env = RuntimeEnvironment(this, args)
-    val service = env.loadRuntimeConfig[BirdNameService]
+    val service = env.loadRuntimeConfig[BirdNameServiceServer]
     service.start()
   }
 }

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

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

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

@@ -1,8 +1,9 @@
 package com.twitter.birdname
 
 import org.specs.Specification
-import com.twitter.admin._
+import com.twitter.ostrich.admin._
 import com.twitter.util._
+import com.twitter.conversions.time._
 
 abstract class AbstractSpec extends Specification {
   val env = RuntimeEnvironment(this, Array("-f", "config/test.scala"))

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 6
+  - 7
   - 0
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Kyle Maxwell
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-03 00:00:00 -08:00
+date: 2011-03-11 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -65,7 +65,6 @@ files:
 - 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
-- scala-bootstrapper.gemspec
 - vendor/sbt-launch-0.7.4.jar
 - vendor/trollop.rb
 has_rdoc: true

data/scala-bootstrapper.gemspec

@@ -1,69 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{scala-bootstrapper}
-  s.version = "0.6.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-03}
-  s.description = %q{Twitter scala project init}
-  s.email = %q{kmaxwell@twitter.com}
-  s.executables = ["sbt", "scala-bootstrapper"]
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "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",
-     "lib/template/config/production.scala.erb",
-     "lib/template/config/staging.scala.erb",
-     "lib/template/config/test.scala.erb",
-     "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/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",
-     "scala-bootstrapper.gemspec",
-     "vendor/sbt-launch-0.7.4.jar",
-     "vendor/trollop.rb"
-  ]
-  s.homepage = %q{http://github.com/fizx/scala-bootstrapper}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
-  s.summary = %q{Twitter scala project init}
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
-    else
-      s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
-  end
-end
-