Permalink
Browse files

gem file fixes

  • Loading branch information...
1 parent 3b73d42 commit ce19039b25f5d57ccdddc37f1441233b5b5eedc0 @pghodgman committed Sep 15, 2013
Showing with 173 additions and 121 deletions.
  1. +11 −13 .idea/osprey-model.iml
  2. +62 −61 .idea/workspace.xml
  3. +3 −3 Gemfile
  4. +34 −38 Gemfile.lock
  5. +63 −6 config/deploy.rb
View
@@ -16,12 +16,12 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" scope="PROVIDED" name="actionmailer (v4.0.0.beta1, RVM: ruby-2.0.0-p0) [gem]" level="application" />
- <orderEntry type="library" scope="PROVIDED" name="actionpack (v4.0.0.beta1, RVM: ruby-2.0.0-p0) [gem]" level="application" />
- <orderEntry type="library" scope="PROVIDED" name="activemodel (v4.0.0.beta1, RVM: ruby-2.0.0-p0) [gem]" level="application" />
- <orderEntry type="library" scope="PROVIDED" name="activerecord (v4.0.0.beta1, RVM: ruby-2.0.0-p0) [gem]" level="application" />
- <orderEntry type="library" scope="PROVIDED" name="activerecord-deprecated_finders (v0.0.3, RVM: ruby-2.0.0-p0) [gem]" level="application" />
- <orderEntry type="library" scope="PROVIDED" name="activesupport (v4.0.0.beta1, RVM: ruby-2.0.0-p0) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="actionmailer (v4.0.0, RVM: ruby-2.0.0-p0) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="actionpack (v4.0.0, RVM: ruby-2.0.0-p0) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="activemodel (v4.0.0, RVM: ruby-2.0.0-p0) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="activerecord (v4.0.0, RVM: ruby-2.0.0-p0) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="activerecord-deprecated_finders (v1.0.3, RVM: ruby-2.0.0-p0) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="activesupport (v4.0.0, RVM: ruby-2.0.0-p0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="arel (v4.0.0, RVM: ruby-2.0.0-p0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="atomic (v1.1.14, RVM: ruby-2.0.0-p0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="builder (v3.1.4, RVM: ruby-2.0.0-p0) [gem]" level="application" />
@@ -35,26 +35,24 @@
<orderEntry type="library" scope="PROVIDED" name="i18n (v0.6.5, RVM: ruby-2.0.0-p0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="jbuilder (v1.0.2, RVM: ruby-2.0.0-p0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="jquery-rails (v3.0.4, RVM: ruby-2.0.0-p0) [gem]" level="application" />
- <orderEntry type="library" scope="PROVIDED" name="json (v1.8.0, RVM: ruby-2.0.0-p0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="mail (v2.5.4, RVM: ruby-2.0.0-p0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="mime-types (v1.25, RVM: ruby-2.0.0-p0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="minitest (v4.7.5, RVM: ruby-2.0.0-p0) [gem]" level="application" />
- <orderEntry type="library" scope="PROVIDED" name="mono_logger (v1.0.1, RVM: ruby-2.0.0-p0) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="mono_logger (v1.1.0, RVM: ruby-2.0.0-p0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="multi_json (v1.8.0, RVM: ruby-2.0.0-p0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="polyglot (v0.3.3, RVM: ruby-2.0.0-p0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="rack (v1.5.2, RVM: ruby-2.0.0-p0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="rack-protection (v1.5.0, RVM: ruby-2.0.0-p0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="rack-test (v0.6.2, RVM: ruby-2.0.0-p0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="rails (v4.0.0.beta1, RVM: ruby-2.0.0-p0) [gem]" level="application" />
- <orderEntry type="library" scope="PROVIDED" name="railties (v4.0.0.beta1, RVM: ruby-2.0.0-p0) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="railties (v4.0.0, RVM: ruby-2.0.0-p0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="rake (v10.1.0, RVM: ruby-2.0.0-p0) [gem]" level="application" />
- <orderEntry type="library" scope="PROVIDED" name="rdoc (v3.12.2, RVM: ruby-2.0.0-p0) [gem]" level="application" />
- <orderEntry type="library" scope="PROVIDED" name="redis (v3.0.3, RVM: ruby-2.0.0-p0) [gem]" level="application" />
- <orderEntry type="library" scope="PROVIDED" name="redis-namespace (v1.2.1, RVM: ruby-2.0.0-p0) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="redis (v3.0.4, RVM: ruby-2.0.0-p0) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="redis-namespace (v1.3.1, RVM: ruby-2.0.0-p0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="resque (v1.24.1, RVM: ruby-2.0.0-p0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="sass (v3.2.10, RVM: ruby-2.0.0-p0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="sass-rails (v4.0.0, RVM: ruby-2.0.0-p0) [gem]" level="application" />
- <orderEntry type="library" scope="PROVIDED" name="sinatra (v1.4.2, RVM: ruby-2.0.0-p0) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="sinatra (v1.4.3, RVM: ruby-2.0.0-p0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="sprockets (v2.10.0, RVM: ruby-2.0.0-p0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="sprockets-rails (v2.0.0, RVM: ruby-2.0.0-p0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="sqlite3 (v1.3.8, RVM: ruby-2.0.0-p0) [gem]" level="application" />
View
@@ -41,6 +41,7 @@
<file path="/items_controller.rb" changelist="f70c7895-ddb5-4f25-9d45-626a9ff47b6b" time="1379206729755" ignored="false" />
<file path="/20130915140035_add_preview_to_model.rb" changelist="f70c7895-ddb5-4f25-9d45-626a9ff47b6b" time="1379253680249" ignored="false" />
<file path="/20130915143011_add_model_meta_data.rb" changelist="f70c7895-ddb5-4f25-9d45-626a9ff47b6b" time="1379255570038" ignored="false" />
+ <file path="/deploy.rb" changelist="f70c7895-ddb5-4f25-9d45-626a9ff47b6b" time="1379263286073" ignored="false" />
<option name="TRACKING_ENABLED" value="true" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -60,15 +61,6 @@
</component>
<component name="FileEditorManager">
<leaf>
- <file leaf-file-name="files_controller.rb" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/app/controllers/files_controller.rb">
- <provider selected="true" editor-type-id="text-editor">
- <state line="9" column="81" selection-start="356" selection-end="431" vertical-scroll-proportion="0.0">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
<file leaf-file-name="routes.rb" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/config/routes.rb">
<provider selected="true" editor-type-id="text-editor">
@@ -87,55 +79,64 @@
</provider>
</entry>
</file>
- <file leaf-file-name="bodies_controller.rb" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/app/controllers/bodies_controller.rb">
+ <file leaf-file-name="locations_controller.rb" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/app/controllers/locations_controller.rb">
<provider selected="true" editor-type-id="text-editor">
- <state line="11" column="0" selection-start="47" selection-end="323" vertical-scroll-proportion="0.0">
+ <state line="9" column="92" selection-start="211" selection-end="343" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="locations_controller.rb" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/app/controllers/locations_controller.rb">
+ <file leaf-file-name="model_processor.rb" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/app/io/model_processor.rb">
<provider selected="true" editor-type-id="text-editor">
- <state line="9" column="92" selection-start="211" selection-end="343" vertical-scroll-proportion="0.0">
+ <state line="200" column="56" selection-start="5824" selection-end="5824" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="instrumenter.rb" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$USER_HOME$/.rvm/gems/ruby-2.0.0-p0/gems/activesupport-4.0.0.beta1/lib/active_support/notifications/instrumenter.rb">
+ <file leaf-file-name="Capfile" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/Capfile">
<provider selected="true" editor-type-id="text-editor">
- <state line="21" column="0" selection-start="577" selection-end="577" vertical-scroll-proportion="0.0">
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="model_processor.rb" pinned="false" current="true" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/app/io/model_processor.rb">
+ <file leaf-file-name="deploy.rb" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/config/deploy.rb">
<provider selected="true" editor-type-id="text-editor">
- <state line="200" column="56" selection-start="5824" selection-end="5824" vertical-scroll-proportion="0.6334842">
+ <state line="2" column="52" selection-start="86" selection-end="86" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="20130915143011_add_model_meta_data.rb" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/db/migrate/20130915143011_add_model_meta_data.rb">
+ <file leaf-file-name="Gemfile" pinned="false" current="true" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/Gemfile">
<provider selected="true" editor-type-id="text-editor">
- <state line="7" column="60" selection-start="213" selection-end="213" vertical-scroll-proportion="0.0">
+ <state line="20" column="67" selection-start="478" selection-end="478" vertical-scroll-proportion="0.5588235">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="Gemfile.lock" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/Gemfile.lock">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="20130913173726_add_foreign_key_to_location.rb" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/db/migrate/20130913173726_add_foreign_key_to_location.rb">
+ <file leaf-file-name="20130915143011_add_model_meta_data.rb" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/db/migrate/20130915143011_add_model_meta_data.rb">
<provider selected="true" editor-type-id="text-editor">
- <state line="2" column="49" selection-start="73" selection-end="117" vertical-scroll-proportion="0.0">
+ <state line="7" column="60" selection-start="213" selection-end="213" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
@@ -160,8 +161,6 @@
<component name="IdeDocumentHistory">
<option name="changedFiles">
<list>
- <option value="$PROJECT_DIR$/Gemfile" />
- <option value="$PROJECT_DIR$/db/migrate/20130913160904_add_model_foreign_keys.rb" />
<option value="$PROJECT_DIR$/app/models/body.rb" />
<option value="$PROJECT_DIR$/app/models/transform.rb" />
<option value="$PROJECT_DIR$/db/migrate/20130913165405_add_transform_foriegn_key.rb" />
@@ -176,6 +175,8 @@
<option value="$PROJECT_DIR$/app/controllers/models_controller.rb" />
<option value="$PROJECT_DIR$/db/migrate/20130915143011_add_model_meta_data.rb" />
<option value="$PROJECT_DIR$/app/io/model_processor.rb" />
+ <option value="$PROJECT_DIR$/config/deploy.rb" />
+ <option value="$PROJECT_DIR$/Gemfile" />
</list>
</option>
</component>
@@ -626,10 +627,10 @@
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
- <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.26040173" sideWeight="0.7367688" order="0" side_tool="false" content_ui="combo" />
- <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2632312" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.26040173" sideWeight="0.7360335" order="0" side_tool="false" content_ui="combo" />
+ <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.26396647" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
- <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.26147428" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
+ <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.26396647" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
@@ -704,34 +705,6 @@
</breakpoint-manager>
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/db/schema.rb">
- <provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/db/migrate/20130913165405_add_transform_foriegn_key.rb">
- <provider selected="true" editor-type-id="text-editor">
- <state line="6" column="51" selection-start="180" selection-end="180" vertical-scroll-proportion="0.0">
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/db/migrate/20130913160904_add_model_foreign_keys.rb">
- <provider selected="true" editor-type-id="text-editor">
- <state line="2" column="47" selection-start="69" selection-end="110" vertical-scroll-proportion="0.0">
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/models/location.rb">
- <provider selected="true" editor-type-id="text-editor">
- <state line="1" column="19" selection-start="55" selection-end="55" vertical-scroll-proportion="0.0">
- <folding />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/app/models/model.rb">
<provider selected="true" editor-type-id="text-editor">
<state line="4" column="0" selection-start="76" selection-end="76" vertical-scroll-proportion="0.0">
@@ -811,7 +784,35 @@
</entry>
<entry file="file://$PROJECT_DIR$/app/io/model_processor.rb">
<provider selected="true" editor-type-id="text-editor">
- <state line="200" column="56" selection-start="5824" selection-end="5824" vertical-scroll-proportion="0.6334842">
+ <state line="200" column="56" selection-start="5824" selection-end="5824" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/Capfile">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/config/deploy.rb">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="2" column="52" selection-start="86" selection-end="86" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/Gemfile.lock">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/Gemfile">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="20" column="67" selection-start="478" selection-end="478" vertical-scroll-proportion="0.5588235">
<folding />
</state>
</provider>
View
@@ -1,15 +1,15 @@
source 'https://rubygems.org'
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '4.0.0.beta1'
+gem 'rails', '4.0.0'
gem 'sqlite3'
# Gems used only for assets and not required
# in production environments by default.
group :assets do
- gem 'sass-rails', '~> 4.0.0.beta1'
- gem 'coffee-rails', '~> 4.0.0.beta1'
+ gem 'sass-rails', '~> 4.0.0'
+ gem 'coffee-rails', '~> 4.0.0'
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
# gem 'therubyracer', platforms: :ruby
Oops, something went wrong.

0 comments on commit ce19039

Please sign in to comment.