scala-bootstrapper 0.6.0 → 0.7.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.6.0
1
+ 0.7.0
@@ -1,4 +1,4 @@
1
- import com.twitter.admin.config._
1
+ import com.twitter.ostrich.admin.config._
2
2
  import com.twitter.conversions.time._
3
3
  import com.twitter.logging.config._
4
4
  import com.twitter.birdname.config._
@@ -1,4 +1,4 @@
1
- import com.twitter.admin.config._
1
+ import com.twitter.ostrich.admin.config._
2
2
  import com.twitter.conversions.time._
3
3
  import com.twitter.logging.config._
4
4
  import com.twitter.birdname.config._
@@ -1,4 +1,4 @@
1
- import com.twitter.admin.config._
1
+ import com.twitter.ostrich.admin.config._
2
2
  import com.twitter.conversions.time._
3
3
  import com.twitter.logging.config._
4
4
  import com.twitter.birdname.config._
@@ -1,4 +1,4 @@
1
- import com.twitter.admin.config._
1
+ import com.twitter.ostrich.admin.config._
2
2
  import com.twitter.conversions.time._
3
3
  import com.twitter.logging.config._
4
4
  import com.twitter.birdname.config._
@@ -3,24 +3,24 @@ import Process._
3
3
  import com.twitter.sbt._
4
4
 
5
5
  class BirdNameProject(info: ProjectInfo) extends StandardServiceProject(info)
6
- with CompileScalaWrappers with NoisyDependencies with DefaultRepos with SubversionPublisher {
6
+ with CompileThriftScala with NoisyDependencies with DefaultRepos with SubversionPublisher {
7
7
 
8
- val finagleVersion = "1.1.23"
8
+ val finagleVersion = "1.2.1"
9
9
  val finagleC = "com.twitter" % "finagle-core" % finagleVersion
10
10
  val finagleT = "com.twitter" % "finagle-thrift" % finagleVersion
11
- val finagleO = "com.twitter" % "finagle-ostrich3" % finagleVersion
12
-
13
- val ostrich = "com.twitter" % "ostrich" % "3.0.6"
11
+ val finagleO = "com.twitter" % "finagle-ostrich4" % finagleVersion
14
12
 
15
13
  // thrift
16
14
  val libthrift = "thrift" % "libthrift" % "0.5.0"
15
+ val util = "com.twitter" % "util" % "1.8.0"
16
+
17
+ override def originalThriftNamespaces = Map("BirdName" -> "com.twitter.birdname.thrift")
18
+ val scalaThriftTargetNamespace = "com.twitter.birdname"
19
+
17
20
  val slf4jVersion = "1.5.11"
18
21
  val slf4jApi = "org.slf4j" % "slf4j-api" % slf4jVersion withSources() intransitive()
19
22
  val slf4jBindings = "org.slf4j" % "slf4j-jdk14" % slf4jVersion withSources() intransitive()
20
23
 
21
- val scalaThriftTargetNamespace = "com.twitter.birdname"
22
- val rubyThriftNamespace = "BirdName"
23
-
24
24
  // for tests
25
25
  val specs = "org.scala-tools.testing" % "specs_2.8.1" % "1.6.7" % "test" withSources()
26
26
  val jmock = "org.jmock" % "jmock" % "2.4.0" % "test"
@@ -2,5 +2,6 @@ import sbt._
2
2
 
3
3
  class Plugins(info: ProjectInfo) extends PluginDefinition(info) {
4
4
  val twitterMaven = "twitter.com" at "http://maven.twttr.com/"
5
- val defaultProject = "com.twitter" % "standard-project" % "0.10.5-scala"
5
+ val defaultProject = "com.twitter" % "standard-project" % "0.11.1"
6
+ val sbtThrift = "com.twitter" % "sbt-thrift" % "1.1.0"
6
7
  }
@@ -4,7 +4,7 @@ import com.twitter.util._
4
4
  import java.util.concurrent.Executors
5
5
  import config._
6
6
 
7
- class BirdNameServiceImpl(config: BirdNameServiceConfig) extends BirdNameService {
7
+ class BirdNameServiceImpl(config: BirdNameServiceConfig) extends BirdNameServiceServer {
8
8
  val serverName = "BirdName"
9
9
  val thriftPort = config.thriftPort
10
10
 
@@ -1,11 +1,11 @@
1
1
  package com.twitter.birdname
2
2
 
3
- import com.twitter.admin._
3
+ import com.twitter.ostrich.admin._
4
4
 
5
5
  object Main {
6
6
  def main(args: Array[String]) {
7
7
  val env = RuntimeEnvironment(this, args)
8
- val service = env.loadRuntimeConfig[BirdNameService]
8
+ val service = env.loadRuntimeConfig[BirdNameServiceServer]
9
9
  service.start()
10
10
  }
11
11
  }
@@ -1,13 +1,12 @@
1
1
  package com.twitter.birdname
2
2
  package config
3
3
 
4
- import com.twitter.admin.{RuntimeEnvironment, ServiceTracker}
5
- import com.twitter.admin.config._
4
+ import com.twitter.ostrich.admin.{RuntimeEnvironment, ServiceTracker}
5
+ import com.twitter.ostrich.admin.config._
6
6
  import com.twitter.logging.Logger
7
- import com.twitter.config._
8
7
  import com.twitter.logging.config._
9
8
 
10
- class BirdNameServiceConfig extends ServerConfig[BirdNameService] {
9
+ class BirdNameServiceConfig extends ServerConfig[BirdNameServiceServer] {
11
10
  var thriftPort: Int = 9999
12
11
 
13
12
  def apply(runtime: RuntimeEnvironment) = new BirdNameServiceImpl(this)
@@ -1,8 +1,9 @@
1
1
  package com.twitter.birdname
2
2
 
3
3
  import org.specs.Specification
4
- import com.twitter.admin._
4
+ import com.twitter.ostrich.admin._
5
5
  import com.twitter.util._
6
+ import com.twitter.conversions.time._
6
7
 
7
8
  abstract class AbstractSpec extends Specification {
8
9
  val env = RuntimeEnvironment(this, Array("-f", "config/test.scala"))
metadata CHANGED
@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
4
4
  prerelease: false
5
5
  segments:
6
6
  - 0
7
- - 6
7
+ - 7
8
8
  - 0
9
- version: 0.6.0
9
+ version: 0.7.0
10
10
  platform: ruby
11
11
  authors:
12
12
  - Kyle Maxwell
@@ -14,7 +14,7 @@ autorequire:
14
14
  bindir: bin
15
15
  cert_chain: []
16
16
 
17
- date: 2011-03-03 00:00:00 -08:00
17
+ date: 2011-03-11 00:00:00 -08:00
18
18
  default_executable:
19
19
  dependencies:
20
20
  - !ruby/object:Gem::Dependency
@@ -65,7 +65,6 @@ files:
65
65
  - lib/template/src/main/thrift/birdname.thrift.erb
66
66
  - lib/template/src/test/scala/com/twitter/birdname/AbstractSpec.scala.erb
67
67
  - lib/template/src/test/scala/com/twitter/birdname/BirdNameServiceSpec.scala.erb
68
- - scala-bootstrapper.gemspec
69
68
  - vendor/sbt-launch-0.7.4.jar
70
69
  - vendor/trollop.rb
71
70
  has_rdoc: true
@@ -1,69 +0,0 @@
1
- # Generated by jeweler
2
- # DO NOT EDIT THIS FILE DIRECTLY
3
- # Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
4
- # -*- encoding: utf-8 -*-
5
-
6
- Gem::Specification.new do |s|
7
- s.name = %q{scala-bootstrapper}
8
- s.version = "0.6.0"
9
-
10
- s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
- s.authors = ["Kyle Maxwell"]
12
- s.date = %q{2011-03-03}
13
- s.description = %q{Twitter scala project init}
14
- s.email = %q{kmaxwell@twitter.com}
15
- s.executables = ["sbt", "scala-bootstrapper"]
16
- s.extra_rdoc_files = [
17
- "LICENSE",
18
- "README.rdoc"
19
- ]
20
- s.files = [
21
- ".document",
22
- ".gitignore",
23
- "LICENSE",
24
- "README.rdoc",
25
- "Rakefile",
26
- "VERSION",
27
- "bin/sbt",
28
- "bin/scala-bootstrapper",
29
- "lib/template/.gitignore",
30
- "lib/template/Capfile",
31
- "lib/template/Gemfile",
32
- "lib/template/bin/console.erb",
33
- "lib/template/config/development.scala.erb",
34
- "lib/template/config/production.scala.erb",
35
- "lib/template/config/staging.scala.erb",
36
- "lib/template/config/test.scala.erb",
37
- "lib/template/project/build.properties",
38
- "lib/template/project/build/BirdNameProject.scala.erb",
39
- "lib/template/project/plugins/Plugins.scala.erb",
40
- "lib/template/src/main/scala/com/twitter/birdname/BirdNameServiceImpl.scala.erb",
41
- "lib/template/src/main/scala/com/twitter/birdname/Main.scala.erb",
42
- "lib/template/src/main/scala/com/twitter/birdname/config/BirdNameServiceConfig.scala.erb",
43
- "lib/template/src/main/thrift/birdname.thrift.erb",
44
- "lib/template/src/test/scala/com/twitter/birdname/AbstractSpec.scala.erb",
45
- "lib/template/src/test/scala/com/twitter/birdname/BirdNameServiceSpec.scala.erb",
46
- "scala-bootstrapper.gemspec",
47
- "vendor/sbt-launch-0.7.4.jar",
48
- "vendor/trollop.rb"
49
- ]
50
- s.homepage = %q{http://github.com/fizx/scala-bootstrapper}
51
- s.rdoc_options = ["--charset=UTF-8"]
52
- s.require_paths = ["lib"]
53
- s.rubygems_version = %q{1.3.6}
54
- s.summary = %q{Twitter scala project init}
55
-
56
- if s.respond_to? :specification_version then
57
- current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
58
- s.specification_version = 3
59
-
60
- if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
61
- s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
62
- else
63
- s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
64
- end
65
- else
66
- s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
67
- end
68
- end
69
-