Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
hnrkndrssn committed Sep 10, 2014
2 parents 35dad90 + f0f7414 commit c00d499
Show file tree
Hide file tree
Showing 8 changed files with 96 additions and 31 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ publish/

# NuGet Packages Directory
packages/
*.nupkg
## TODO: If the tool you use requires repositories.config uncomment the next line
#!packages/repositories.config

Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@ Install the NuGet package by running `scriptcs -install ScriptCs.OctopusClient`

``` csharp
var octopus = Require<OctopusClientPack>();
var repo = octopus.GetRepository("http://server/octopusdeploy/api", "API-XXXXXXXXXXXXXXXXXXXXXXXXXXX");
var server = octopus.Server("http://server/octopusdeploy/api", "API-XXXXXXXXXXXXXXXXXXXXXXXXXXX");
Console.WriteLine("Getting the current user...");
var user = repo.Users.GetCurrent();
var user = server.Users.GetCurrent();
Console.WriteLine("Current user: {0}", user.DisplayName);
Console.WriteLine("Getting your dashboard...");
var dashboard = repo.Dashboards.GetDashboard();
var dashboard = server.Dashboards.GetDashboard();
foreach(var item in dashboard.Items)
{
var project = repo.Projects.Get(item.ProjectId);
var environment = repo.Environments.Get(item.EnvironmentId);
var project = server.Projects.Get(item.ProjectId);
var environment = server.Environments.Get(item.EnvironmentId);
Console.WriteLine("Project: {0} -> Environment: {1} -> Release Version: {2}", project.Name, environment.Name, item.ReleaseVersion);
}
```
Expand Down
8 changes: 4 additions & 4 deletions src/ScriptCs.OctopusClient.Sample/packages.config
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Newtonsoft.Json" version="6.0.3" targetFramework="net45" />
<package id="Octopus.Client" version="2.5.3.245" targetFramework="net40" />
<package id="ScriptCs.Contracts" version="0.9.0" targetFramework="net45" />
<package id="ScriptCs.OctopusClient" version="0.0.2" targetFramework="net45" />
<package id="Newtonsoft.Json" version="6.0.5" targetFramework="net45" />
<package id="Octopus.Client" version="2.5.8.447" targetFramework="net40" />
<package id="ScriptCs.Contracts" version="0.10.2" targetFramework="net45" />
<package id="ScriptCs.OctopusClient" version="0.1.1" targetFramework="net45" />
<package id="Sprache" version="1.10.0.37" targetFramework="net40" />
</packages>
10 changes: 5 additions & 5 deletions src/ScriptCs.OctopusClient.Sample/sample.csx
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
var octopus = Require<OctopusClientPack>();
var repo = octopus.GetRepository("http://server/octopusdeploy/api", "API-XXXXXXXXXXXXXXXXXXXXXXXXXXX");
var server = octopus.Server("http://server/octopusdeploy/api", "API-XXXXXXXXXXXXXXXXXXXXXXXXXXX");
Console.WriteLine("Getting the current user...");
var user = repo.Users.GetCurrent();
var user = server.Users.GetCurrent();
Console.WriteLine("Current user: {0}", user.DisplayName);
Console.WriteLine("Getting your dashboard...");
var dashboard = repo.Dashboards.GetDashboard();
var dashboard = server.Dashboards.GetDashboard();
foreach(var item in dashboard.Items)
{
var project = repo.Projects.Get(item.ProjectId);
var environment = repo.Environments.Get(item.EnvironmentId);
var project = server.Projects.Get(item.ProjectId);
var environment = server.Environments.Get(item.EnvironmentId);
Console.WriteLine("Project: {0} -> Environment: {1} -> Release Version: {2}", project.Name, environment.Name, item.ReleaseVersion);
}
69 changes: 65 additions & 4 deletions src/ScriptCs.OctopusClient/OctopusClientPack.cs
Original file line number Diff line number Diff line change
@@ -1,15 +1,76 @@
using Octopus.Client;
using System.IO;
using System.Runtime.InteropServices.ComTypes;
using Octopus.Client;
using Octopus.Client.Model;
using ScriptCs.Contracts;

namespace ScriptCs.OctopusClient
{
public class OctopusClientPack : IScriptPackContext
{
public OctopusRepository GetRepository(string hostUrl, string apiKey)
private IOctopusClient _client;

public OctopusRepository Server(string hostUrl, string apiKey)
{
var endpoint = new OctopusServerEndpoint(hostUrl, apiKey);

return new OctopusRepository(endpoint);
var repository = new OctopusRepository(endpoint);
_client = repository.Client;

return repository;
}

public RootResource GetRootDocument()
{
return _client.RootDocument;
}

public ResourceCollection<T> List<T>(string path, object pathParameters = null)
{
return _client.List<T>(path, pathParameters);
}

public T Get<T>(string path, object pathParameters = null)
{
return _client.Get<T>(path, pathParameters);
}

public Stream GetContent(string path)
{
return _client.GetContent(path);
}

public T Create<T>(string path, T resource)
{
return _client.Create(path, resource);
}

public void Post(string path)
{
_client.Post(path);
}
public void Post<T>(string path, T resource)
{
_client.Post(path, resource);
}

public void Put<T>(string path, T resource)
{
_client.Put(path, resource);
}

public void PutContent(string path, Stream content)
{
_client.PutContent(path, content);
}

public T Update<T>(string path, T resource)
{
return _client.Update(path, resource);
}

public TaskResource Delete(string path)
{
return _client.Delete(path);
}
}
}
6 changes: 3 additions & 3 deletions src/ScriptCs.OctopusClient/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@

[assembly: Guid("2bd92078-7efd-4c16-898e-f995bcbe0d58")]

[assembly: AssemblyVersion("0.0.2")]
[assembly: AssemblyFileVersion("0.0.2")]
[assembly: AssemblyInformationalVersion("0.0.2")]
[assembly: AssemblyVersion("0.1.1")]
[assembly: AssemblyFileVersion("0.1.1")]
[assembly: AssemblyInformationalVersion("0.1.1")]
17 changes: 10 additions & 7 deletions src/ScriptCs.OctopusClient/ScriptCs.OctopusClient.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,19 @@
<ItemGroup>
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Newtonsoft.Json.6.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
<HintPath>..\packages\Newtonsoft.Json.6.0.5\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Octopus.Client">
<HintPath>..\packages\Octopus.Client.2.5.3.245\lib\net40\Octopus.Client.dll</HintPath>
<Reference Include="Octopus.Client, Version=2.5.8.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Octopus.Client.2.5.8.447\lib\net40\Octopus.Client.dll</HintPath>
</Reference>
<Reference Include="Octopus.Platform">
<HintPath>..\packages\Octopus.Client.2.5.3.245\lib\net40\Octopus.Platform.dll</HintPath>
<Reference Include="Octopus.Platform, Version=2.5.8.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Octopus.Client.2.5.8.447\lib\net40\Octopus.Platform.dll</HintPath>
</Reference>
<Reference Include="ScriptCs.Contracts">
<HintPath>..\packages\ScriptCs.Contracts.0.9.0\lib\net45\ScriptCs.Contracts.dll</HintPath>
<Reference Include="ScriptCs.Contracts, Version=0.10.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\ScriptCs.Contracts.0.10.2\lib\net45\ScriptCs.Contracts.dll</HintPath>
</Reference>
<Reference Include="Sprache">
<HintPath>..\packages\Sprache.1.10.0.37\lib\net40\Sprache.dll</HintPath>
Expand Down
6 changes: 3 additions & 3 deletions src/ScriptCs.OctopusClient/packages.config
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Newtonsoft.Json" version="6.0.3" targetFramework="net45" />
<package id="Octopus.Client" version="2.5.3.245" targetFramework="net45" />
<package id="ScriptCs.Contracts" version="0.9.0" targetFramework="net45" />
<package id="Newtonsoft.Json" version="6.0.5" targetFramework="net45" />
<package id="Octopus.Client" version="2.5.8.447" targetFramework="net45" />
<package id="ScriptCs.Contracts" version="0.10.2" targetFramework="net45" />
<package id="Sprache" version="1.10.0.37" targetFramework="net45" />
</packages>

0 comments on commit c00d499

Please sign in to comment.